diff --git a/Packets/MPEGDVBBundle/TLVPacket.cc b/Packets/MPEGDVBBundle/TLVPacket.cc index d93d5c2ff189c3ef042eee9be43ff1556915d2f8..74b03809362f2ec939bce749682c915d41a900a1 100644 --- a/Packets/MPEGDVBBundle/TLVPacket.cc +++ b/Packets/MPEGDVBBundle/TLVPacket.cc @@ -21,15 +21,13 @@ // 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /** \file - \brief DSMCCSection non-inline non-template implementation */ + \brief TLVPacket non-inline non-template implementation */ #include "TLVPacket.hh" //#include "TLVPacket.ih" // Custom includes #include <iomanip> -#include "../../Utils/hexdump.hh" -#include "../../Packets/DefaultBundle/EthernetPacket.hh" #define prefix_ @@ -39,14 +37,11 @@ prefix_ senf::PacketParserBase::size_type senf::Parse_TLVPacket::bytes() const { +//#include <iostream> +// std::cout << "XX: " << unsigned( 4 + senf::bytes( length() ) ) << "\n"; return 4 + senf::bytes( length() ); } -//prefix_ void senf::TLVPacketType::init(packet p) -//{ -// p->init(); -//} - prefix_ void senf::TLVPacketType::dump(packet p, std::ostream & os) { os << "TLVPacket:\n" @@ -55,15 +50,11 @@ prefix_ void senf::TLVPacketType::dump(packet p, std::ostream & os) << " length: " << unsigned(p->length()) << "\n"; } -prefix_ senf::PacketParserBase::size_type senf::TLVPacketType::initSize() -{ - return 4 + 1; -} +//prefix_ senf::PacketParserBase::size_type senf::TLVPacketType::initSize() +//{ +// return 4 + 1; +//} -prefix_ senf::PacketParserBase::size_type senf::TLVPacketType::initHeadSize() -{ - return 4 + 1; -} ///////////////////////////////cc.e//////////////////////////////////////// #undef prefix_ diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh index 08de4cd3982754c0954fe342de7f388572de5c0c..449f148867b11eec55580542eb60938fc2367cd6 100644 --- a/Packets/MPEGDVBBundle/TLVPacket.hh +++ b/Packets/MPEGDVBBundle/TLVPacket.hh @@ -149,12 +149,12 @@ namespace senf { using mixin::nextPacketRange; using mixin::init; - + using mixin::initSize; static void dump(packet p, std::ostream & os); - static PacketParserBase::size_type initSize(); - static PacketParserBase::size_type initHeadSize(); +// static PacketParserBase::size_type initSize(); +// static PacketParserBase::size_type initHeadSize(); }; typedef TLVPacketType::packet TLVPacket; diff --git a/Packets/MPEGDVBBundle/TLVPacket.test.cc b/Packets/MPEGDVBBundle/TLVPacket.test.cc index e0755bce14b4021812c0d97b10d4629e03b071d3..46199302705ef5f1289160afc381f7e9e990e7b8 100644 --- a/Packets/MPEGDVBBundle/TLVPacket.test.cc +++ b/Packets/MPEGDVBBundle/TLVPacket.test.cc @@ -28,6 +28,7 @@ // Custom includes #include "TLVPacket.hh" #include <senf/Packets.hh> +#include <senf/Utils/hexdump.hh> #include <boost/test/auto_unit_test.hpp> #include <boost/test/test_tools.hpp> @@ -55,6 +56,8 @@ BOOST_AUTO_UNIT_TEST(tlvPacket_parse_packet_with_extended_length) BOOST_CHECK_EQUAL( p->length(), 0x0Au ); senf::PacketData & p_value (p.next().data()); + senf::hexdump( p_value.begin(), p_value.end(), std::cout ); + // BOOST_CHECK_EQUAL( p_value.size(), 0x0Au); }