X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FMPEGDVBBundle%2FTLVPacket.hh;h=492507519b5de73664853abd51aa4414f0c0e256;hb=c0b5c560da72983939b286632ac481e076649ddb;hp=2bbccb35ba18e2810b14d7c46371fa9e1525953a;hpb=63b12ae31810ee764d8a44c039056727da951bf8;p=senf.git

diff --git a/Packets/MPEGDVBBundle/TLVPacket.hh b/Packets/MPEGDVBBundle/TLVPacket.hh
index 2bbccb3..4925075 100644
--- 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,114 +28,105 @@
 
 // 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 {
 
-    struct UnsuportedTLVPacketException : public std::exception
-    { 
-        virtual char const * what() const throw() { 
-            return "length of length can be max. 4 bytes. Sorry.";
-        }
-    };
-
-    class Parse_TLVPacketLength 
-        : public detail::packet::ParseIntOps<Parse_TLVPacketLength, boost::uint32_t>,
+    /** \brief xxx
+        
+        \todo document me
+        \todo add usefull exceptions strings
+         
+    */
+    struct UnsuportedTLVPacketException : public senf::Exception
+    { UnsuportedTLVPacketException() 
+          : senf::Exception("length of length can be max. 4 bytes. Sorry."){} };
+
+    /** \brief xxx
+        \todo document me
+    */
+    class DynamicTLVLengthParser 
+        : public detail::packet::IntParserOps<DynamicTLVLengthParser, boost::uint32_t>,
           public PacketParserBase
     {
     public:
-#       ifndef DOXYGEN
-        
-        SENF_PACKET_PARSER_NO_INIT(Parse_TLVPacketLength);
-
-#       endif
+        DynamicTLVLengthParser(data_iterator i, state_type s) : PacketParserBase(i,s) {}
 
         typedef boost::uint32_t value_type;
-    
-        value_type value() const;
+        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);
-            
-        static const size_type init_bytes = 1;
-
+        DynamicTLVLengthParser 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;
+        typedef FlagParser      <    0 > ExtendedLengthFlagParser;
+        typedef UIntFieldParser < 1, 8 > FixedLengthParser;
 
-        Parse_extended_length_flag extended_length_flag() const {
-            return parse<Parse_extended_length_flag>( 0 );
+        ExtendedLengthFlagParser extended_length_flag() const {
+            return parse<ExtendedLengthFlagParser>( 0 );
         }
 
-        Parse_fixed_length fixed_length_field() const {
-            return parse<Parse_fixed_length>( 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 TypeParser, 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,   TypeParser );
+        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 TypeParser, class LengthParser>
     struct TLVPacketType
         : public PacketTypeBase
     {
-        typedef ConcretePacket<TLVPacketType> packet;
-        typedef Parse_TLVPacket parser;
+        typedef ConcretePacket<TLVPacketType<TypeParser, LengthParser> > packet;
+        typedef TLVPacketParser<TypeParser, LengthParser> parser;
 
         static optional_range nextPacketRange(packet p);
-        static void init(packet p);
         static size_type initSize();
+        
         static void finalize(packet p);
+        
         static void dump(packet p, std::ostream & os);
     };
-        
-    typedef TLVPacketType::packet TLVPacket;
     
+    typedef ConcretePacket<TLVPacketType<UInt32Parser, DynamicTLVLengthParser> > MIHInfoElement;
 }
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 //#include "TLVPacket.cci"
-//#include "TLVPacket.ct"
+#include "TLVPacket.ct"
 //#include "TLVPacket.cti"
 #endif