NEW FILE HEADER / COPYRIGHT FORMAT

[senf.git] / Packets / MPEGDVBBundle / TLVPacket.hh

diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index a1b3628..4ba9b94 100644 (file)
--- a/Packets/MPEGDVBBundle/TLVPacket.hh
+++ b/Packets/MPEGDVBBundle/TLVPacket.hh
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.de>
+// Fraunhofer Institute for Open Communication Systems (FOKUS) 
+// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+//     Thorsten Horstmann <tho@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -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,111 +48,96 @@ namespace senf {
         }
     };
 
-    struct Parse_TLVPacketLength 
-        : public detail::packet::ParseIntOps<Parse_TLVPacketLength, boost::uint32_t>,
+    /** \brief xxx
+        \todo document me
+    */
+    class TLVPacketLengthParser 
+        : public detail::packet::IntParserOps<TLVPacketLengthParser, boost::uint32_t>,
           public PacketParserBase
     {
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_NO_INIT(Parse_TLVPacketLength);
-
-#       endif
+    public:
+        TLVPacketLengthParser(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);
         
-        typedef Parse_Flag      <    0 > Parse_extended_length_flag;
-        typedef Parse_UIntField < 1, 8 > Parse_fixed_length;
+        TLVPacketLengthParser const & operator= (value_type other);
+    
+        size_type bytes() const;
+            
+        void init() const;
 
-        Parse_extended_length_flag extended_length_flag() const {
-            return parse<Parse_extended_length_flag>( 0 );
-        }
+    private:
+        typedef FlagParser      <    0 > ExtendedLengthFlagParser;
+        typedef UIntFieldParser < 1, 8 > FixedLengthParser;
 
-        Parse_fixed_length fixed_length_field() const {
-            return parse<Parse_fixed_length>( 0 );
+        ExtendedLengthFlagParser extended_length_flag() const {
+            return parse<ExtendedLengthFlagParser>( 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;
+        FixedLengthParser fixed_length_field() const {
+            return parse<FixedLengthParser>( 0 );
         }
         
+        void resize(size_type size);
     };  
         
     /** \brief parse TLVPacket Packet
     
-        XXX
-        
+        \todo document me
+     
         \see TLVPacketType
      */
-    struct Parse_TLVPacket : public PacketParserBase
+    template <class LengthParser>
+    struct TLVPacketParser : public PacketParserBase
     {
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_INIT(Parse_TLVPacket);
+#       include SENF_PARSER()
         
-        SENF_PACKET_PARSER_DEFINE_FIELDS(
-            ((Field)( type,   Parse_UInt32          ))
-            ((Field)( length, Parse_TLVPacketLength ))
-        );
+        SENF_PARSER_FIELD( type,   UInt32Parser );
+        SENF_PARSER_FIELD( length, LengthParser );
         
-#       endif
+        SENF_PARSER_FINALIZE(TLVPacketParser);
     };
-
-    /** \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 TLVPacketParser<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<TLVPacketLengthParser>::packet TLVPacket;
     
+    typedef ConcretePacket<TLVPacketType<UInt8Parser> >  TLVFix8Packet;
+    typedef ConcretePacket<TLVPacketType<UInt16Parser> > TLVFix16Packet;
+    typedef ConcretePacket<TLVPacketType<UInt24Parser> > TLVFix24Packet;
+    typedef ConcretePacket<TLVPacketType<UInt32Parser> > TLVFix32Packet;
 }
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 //#include "TLVPacket.cci"
-//#include "TLVPacket.ct"
+#include "TLVPacket.ct"
 //#include "TLVPacket.cti"
 #endif