X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTLVPacket.hh;h=3954df923041105815cf82daa6f9a8b902772da0;hb=80c17af991e2f4690c7601e4408954322b176fe9;hp=a1b3628d463050ef9501ac523148acfe47aa4e21;hpb=3338998867a4d76adb58e93bd12ab8ff2a0cf4df;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index a1b3628..3954df9 100644
--- a/Packets/MPEGDVBBundle/TLVPacket.hh
+++ b/Packets/MPEGDVBBundle/TLVPacket.hh
@@ -28,15 +28,19 @@
 
 // Custom includes
 #include <algorithm>
-#include "../../Packets/PacketType.hh"
-#include "../../Packets/ParseInt.hh"
-#include "../../Packets/PacketParser.hh"
+#include "../../Packets/Packets.hh"
 
 //#include "TLVPacket.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 
+    /** \brief xxx
+        
+        \todo document me
+        \todo add usefull exceptions strings
+         
+    */
     struct UnsuportedTLVPacketException : public std::exception
     { 
         virtual char const * what() const throw() { 
@@ -44,18 +48,31 @@ namespace senf {
         }
     };
 
-    struct Parse_TLVPacketLength 
+    /** \brief xxx
+        \todo document me
+    */
+    class Parse_TLVPacketLength 
         : public detail::packet::ParseIntOps<Parse_TLVPacketLength, boost::uint32_t>,
           public PacketParserBase
     {
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_NO_INIT(Parse_TLVPacketLength);
-
-#       endif
+    public:
+        Parse_TLVPacketLength(data_iterator i, state_type s) : PacketParserBase(i,s) {}
 
         typedef boost::uint32_t value_type;
+        static const size_type init_bytes = 1;
+        static value_type const min_value = 0;
+        static value_type const max_value = 4294967295u;
+
+        value_type value() const;
+        void value(value_type const & v);
         
+        Parse_TLVPacketLength const & operator= (value_type other);
+    
+        size_type bytes() const;
+            
+        void init() const;
+
+    private:
         typedef Parse_Flag      <    0 > Parse_extended_length_flag;
         typedef Parse_UIntField < 1, 8 > Parse_fixed_length;
 
@@ -67,88 +84,60 @@ namespace senf {
             return parse<Parse_fixed_length>( 0 );
         }
         
-        value_type value() const {
-            switch( bytes() ) {
-                case 1:
-                    return fixed_length_field().value();
-                case 2:
-                    return parse<Parse_UInt8>( 1 ).value();
-                case 3:
-                    return parse<Parse_UInt16>( 1 ).value();
-                case 4:
-                    return parse<Parse_UInt24>( 1 ).value();
-                case 5:
-                    return parse<Parse_UInt32>( 1 ).value();
-                default:
-                    throw(UnsuportedTLVPacketException()); 
-            };
-        }
-        
-        static const size_type init_bytes = 1;
-
-        size_type bytes() const {
-            if ( extended_length_flag() )
-                return 1 + fixed_length_field();
-            else
-                return 1;
-        }
-        
-        void init() const {
-            defaultInit();
-            extended_length_flag() = 0;
-        }
-        
+        void resize(size_type size);
     };  
         
     /** \brief parse TLVPacket Packet
     
-        XXX
-        
+        \todo document me
+     
         \see TLVPacketType
      */
+    template <class LengthParser>
     struct Parse_TLVPacket : public PacketParserBase
     {
-#       ifndef DOXYGEN
+#       include SENF_PARSER()
         
-        SENF_PACKET_PARSER_INIT(Parse_TLVPacket);
+        SENF_PARSER_FIELD( type,   Parse_UInt32 );
+        SENF_PARSER_FIELD( length, LengthParser );
         
-        SENF_PACKET_PARSER_DEFINE_FIELDS(
-            ((Field)( type,   Parse_UInt32          ))
-            ((Field)( length, Parse_TLVPacketLength ))
-        );
-        
-#       endif
+        SENF_PARSER_FINALIZE(Parse_TLVPacket);
     };
-
-    /** \brief TLV Packet
+    
+    /** \brief generic TLV Packet type
+        
+        \todo document me
         
-        \par Packet type (typedef):
-            \ref TLVPacket
-
-        \par Fields:
-            \ref Parse_TLVPacket
-
         \ingroup protocolbundle_mpegdvb
      */
+    template <class LengthParser>
     struct TLVPacketType
         : public PacketTypeBase
     {
-        typedef ConcretePacket<TLVPacketType> packet;
-        typedef Parse_TLVPacket parser;
-
+#ifndef DOXYGEN
+        typedef ConcretePacket<TLVPacketType<LengthParser> > packet;
+        typedef Parse_TLVPacket<LengthParser> parser;
+#endif
         static optional_range nextPacketRange(packet p);
+        static size_type initSize();
+        
+        static void finalize(packet p);
         
         static void dump(packet p, std::ostream & os);
     };
-        
-    typedef TLVPacketType::packet TLVPacket;
+
+    typedef TLVPacketType<Parse_TLVPacketLength>::packet TLVPacket;
     
+    typedef ConcretePacket<TLVPacketType<Parse_UInt8> >  TLVFix8Packet;
+    typedef ConcretePacket<TLVPacketType<Parse_UInt16> > TLVFix16Packet;
+    typedef ConcretePacket<TLVPacketType<Parse_UInt24> > TLVFix24Packet;
+    typedef ConcretePacket<TLVPacketType<Parse_UInt32> > TLVFix32Packet;
 }
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 //#include "TLVPacket.cci"
-//#include "TLVPacket.ct"
+#include "TLVPacket.ct"
 //#include "TLVPacket.cti"
 #endif