X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVPacket.cc;h=de812a3e285fbfb1e2fd813a71c74c8476a0ee5b;hb=2571369f6d1701b241a56a78c6a3d6d7569799c7;hp=1e0e997cd70c56d659147dcca1c29c1b0a93b8e3;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/80221Bundle/TLVPacket.cc b/senf/Packets/80221Bundle/TLVPacket.cc
index 1e0e997..de812a3 100644
--- a/senf/Packets/80221Bundle/TLVPacket.cc
+++ b/senf/Packets/80221Bundle/TLVPacket.cc
@@ -28,7 +28,7 @@
 
 // Custom includes
 #include <iomanip>
-#include "../../Utils/hexdump.hh"
+#include <senf/Utils/hexdump.hh>
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -37,9 +37,9 @@ prefix_ senf::safe_data_iterator senf::BaseTLVPacketParser::resizeValueField(
         DynamicTLVLengthParser::value_type size) 
 {
     DynamicTLVLengthParser::value_type current_length ( length());
-    length( size);
+    length_() << size;
 
-    safe_data_iterator si (data(), boost::next(i(), 1 + length_bytes() ));
+    safe_data_iterator si (data(), boost::next(i(), 1 + length_().bytes() ));
     if (current_length > size)
         data().erase( si, boost::next(si, current_length-size));
     else
@@ -146,7 +146,7 @@ prefix_ void senf::DynamicTLVLengthParser::finalize()
         if (b != 3) resize(3);
         return;
     }
-    if (v <= UInt24Parser::max_value + 128 ){
+    if (v <= UInt24Parser::max_value + 128 ) {
         if (b != 4) resize(4);
         return;
     }
@@ -199,7 +199,7 @@ prefix_ void senf::DynamicTLVLengthParser::resize(size_type size)
 prefix_ senf::PacketInterpreterBase::range senf::GenericTLVPacketParser::value() 
     const
 {
-    senf::PacketData::iterator begin (boost::next(data().begin(), 1 + length_bytes() ));
+    senf::PacketData::iterator begin (boost::next(data().begin(), 1 + length_().bytes() ));
     return PacketInterpreterBase::range(
             begin, boost::next( begin, length()) );
 }
@@ -210,19 +210,13 @@ prefix_ void senf::GenericTLVPacketType::dump(packet p, std::ostream & os)
     boost::io::ios_all_saver ias(os);
     os << "GenericTLVPacket:\n"
        << std::dec
-       <<     "  type                    : " << unsigned( p->type()) << "\n"
-       <<     "  length                  : " << unsigned( p->length()) << "\n"
-       <<     "  value\n                 : ";
+       << senf::fieldName("type")                      << unsigned( p->type()) << "\n"
+       << senf::fieldName("length")                    << unsigned( p->length()) << "\n"
+       << "  value:\n";
     senf::hexdump( p->value().begin(), p->value().end(), os);
 }
 
 
-prefix_ void senf::GenericTLVPacketType::finalize(packet p)
-{
-    p->finalizeLength();
-}
-
-
 ///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_