X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTLVPacket.cc;h=628bf550144d2b1b7c2ca781021c87a77e1cdb8f;hb=96d3a2a43b4e6d7693a136a3adeb099440f19068;hp=270d81fd128da229b972e0c68def843f65c4a02b;hpb=63b12ae31810ee764d8a44c039056727da951bf8;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TLVPacket.cc b/Packets/MPEGDVBBundle/TLVPacket.cc
index 270d81f..628bf55 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.cc
+++ b/Packets/MPEGDVBBundle/TLVPacket.cc
@@ -33,7 +33,8 @@
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ senf::Parse_TLVPacketLength::value_type senf::Parse_TLVPacketLength::value() const {
+prefix_ senf::Parse_TLVPacketLength::value_type senf::Parse_TLVPacketLength::value() const 
+{
     switch (bytes() ) {
     case 1:
         return fixed_length_field().value();
@@ -50,79 +51,89 @@ prefix_ senf::Parse_TLVPacketLength::value_type senf::Parse_TLVPacketLength::val
     };
 }
 
-prefix_ void senf::Parse_TLVPacketLength::value(value_type const & v) {
+prefix_ void senf::Parse_TLVPacketLength::value(value_type const & v) 
+{
     if (v > 4294967295u)
         throw(UnsuportedTLVPacketException());
-        
+    
+    SafePacketParser<Parse_TLVPacketLength> safeThis (*this);
     if (v < 128u) {
-        if (bytes() != 1) resize(1);
-        fixed_length_field() = v;
+        if (bytes() != 1) {
+            resize(1);
+	    safeThis->extended_length_flag() = false;
+	} 
+        safeThis->fixed_length_field() = v;
         return;
     }
     if (v < 256u) {
-        if (bytes() != 2) resize(2);
-        parse<Parse_UInt8>(1) = v;
+        if (bytes() != 2) {
+	    resize(2);
+            safeThis->extended_length_flag() = true;
+	    safeThis->fixed_length_field() = 1;
+	}
+        safeThis->parse<Parse_UInt8>(1) = v;
         return;
     }
     if (v < 65536u) {
-        if (bytes() != 3) resize(3);
-        parse<Parse_UInt16>(1) = v;
+        if (bytes() != 3) {
+	    resize(3);
+	    safeThis->extended_length_flag() = true;
+	    safeThis->fixed_length_field() = 2;
+	}
+        safeThis->parse<Parse_UInt16>(1) = v;
         return;
     }
     if (v < 16777216u) {
-        if (bytes() != 4) resize(4);
-        parse<Parse_UInt24>(1) = v;
+        if (bytes() != 4) {
+	    resize(4);
+	    safeThis->extended_length_flag() = true;
+	    safeThis->fixed_length_field() = 3;
+	}
+        safeThis->parse<Parse_UInt24>(1) = v;
         return;
     }
     if (v <= 4294967295u) {
-        if (bytes() != 5) resize(5);
-        parse<Parse_UInt32>(1) = v;
+        if (bytes() != 5) {
+	    resize(5);
+	    safeThis->extended_length_flag() = true;
+	    safeThis->fixed_length_field() = 4;
+	}
+        safeThis->parse<Parse_UInt32>(1) = v;
         return;
     }
 }
 
-prefix_ senf::Parse_TLVPacketLength const & senf::Parse_TLVPacketLength::operator= (value_type other) {
+prefix_ senf::Parse_TLVPacketLength const & senf::Parse_TLVPacketLength::operator= (value_type other) 
+{
     value(other);
     return *this; 
 }
 
-prefix_ senf::Parse_TLVPacketLength::size_type senf::Parse_TLVPacketLength::bytes() const {
+prefix_ senf::Parse_TLVPacketLength::size_type senf::Parse_TLVPacketLength::bytes() const 
+{
     if ( extended_length_flag() )
         return 1 + fixed_length_field();
     else
         return 1;
 }
     
-prefix_ void senf::Parse_TLVPacketLength::init() const {
+prefix_ void senf::Parse_TLVPacketLength::init() const 
+{
     defaultInit();
     extended_length_flag() = 0;
 }
 
-prefix_ void senf::Parse_TLVPacketLength::resize(size_type size) {
-    std::cout << "senf::Parse_TLVPacketLength::resize: " << unsigned(size) << "\n";
-//    hexdump(data().begin(), data().end(), std::cout);
-    
+prefix_ void senf::Parse_TLVPacketLength::resize(size_type size) 
+{
     size_type current_size (bytes());
     safe_data_iterator si (data(), i());
     
     if (current_size > size)
         data().erase( si, boost::next(si, current_size-size));
-    else {
+    else
         data().insert( si, size-current_size, 0);
-        Parse_TLVPacketLength(si,state()).init();
-    }
-    
-    if (size > 1) {
-        extended_length_flag() = 1;
-        fixed_length_field() = size-1;
-    } else {
-        extended_length_flag() = 0;
-    }
-    
-//    hexdump(data().begin(), data().end(), std::cout);
 }
 
-
 prefix_ void senf::TLVPacketType::dump(packet p, std::ostream & os)
 {
     os << "TLVPacket:\n"