diff --git a/Packets/DefaultBundle/IpV6Packet.test.cc b/Packets/DefaultBundle/IpV6Packet.test.cc index 57c8dc4c849862f318d910bbf0abd37b34eb9cd3..d19e0500c89eb29a333cf427e496e1a1e15176cf 100644 --- a/Packets/DefaultBundle/IpV6Packet.test.cc +++ b/Packets/DefaultBundle/IpV6Packet.test.cc @@ -47,7 +47,6 @@ BOOST_AUTO_UNIT_TEST(ipV6Packet_packet) senf::IpV6Packet p (senf::IpV6Packet::create(data)); - BOOST_CHECK_EQUAL( p->version(), 0x06u ); BOOST_CHECK_EQUAL( p->trafficClass(), 0x01u ); BOOST_CHECK_EQUAL( p->flowLabel(), 0x22030u ); diff --git a/Packets/MPEGDVBBundle/SConscript b/Packets/MPEGDVBBundle/SConscript index b52cf4c2db2dc12610f594882de8cd10e477e8c0..2a0c12c60209bb975bfb7d7e61bb089485c7ef80 100644 --- a/Packets/MPEGDVBBundle/SConscript +++ b/Packets/MPEGDVBBundle/SConscript @@ -13,5 +13,8 @@ SENFSCons.Object(env, target = 'MPEGDVBBundle', sources=sources, LIBS = ['Packets', 'Socket', 'Utils']) SENFSCons.Lib(env, library = 'Packets_MPEGDVBBundle', sources = sources[0], LIBS = ['Packets', 'Socket', 'Utils'], no_includes = 1) - -SENFSCons.Doxygen(env) + +myEnv = env.Clone(DIA2PNGMAXWIDTH = 600) +SENFSCons.Doxygen(env, extra_sources = [ + myEnv.Dia2Png("TLV.dia", ) +]) diff --git a/Packets/MPEGDVBBundle/TLV.dia b/Packets/MPEGDVBBundle/TLV.dia new file mode 100644 index 0000000000000000000000000000000000000000..d3bdc7cb548fe0a0ed0bbb357ffef7cc577f8bac Binary files /dev/null and b/Packets/MPEGDVBBundle/TLV.dia differ diff --git a/Packets/MPEGDVBBundle/TLVPacket.cc b/Packets/MPEGDVBBundle/TLVPacket.cc index 628bf550144d2b1b7c2ca781021c87a77e1cdb8f..44c63383f125c0a02b9b52641b102ead1741c01b 100644 --- a/Packets/MPEGDVBBundle/TLVPacket.cc +++ b/Packets/MPEGDVBBundle/TLVPacket.cc @@ -60,8 +60,8 @@ prefix_ void senf::Parse_TLVPacketLength::value(value_type const & v) if (v < 128u) { if (bytes() != 1) { resize(1); - safeThis->extended_length_flag() = false; - } + safeThis->extended_length_flag() = false; + } safeThis->fixed_length_field() = v; return; } diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh index f81eafd99b224ea72a71ca7297975603692c6aeb..f52da1cdb4fb384951d7b09a155a955f570faff2 100644 --- a/Packets/MPEGDVBBundle/TLVPacket.hh +++ b/Packets/MPEGDVBBundle/TLVPacket.hh @@ -80,7 +80,7 @@ namespace senf { /** \brief parse TLVPacket Packet - XXX + \see TLVPacketType */ @@ -95,6 +95,7 @@ namespace senf { }; /** \brief TLV Packet + \image html TLV.png \par Packet type (typedef): \ref TLVPacket