X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIpV4Packet.hh;h=e8879a2e1129af6da3afb6cf22e750e36340f969;hb=2c10a733c69cd95e10a312a471c84d07d52b7755;hp=c8566444567015585d8dd633de8a737521f77f43;hpb=31d85cd6b8e03c5ecc924ca8892906be1bab702f;p=senf.git

diff --git a/Packets/DefaultBundle/IpV4Packet.hh b/Packets/DefaultBundle/IpV4Packet.hh
index c856644..e8879a2 100644
--- a/Packets/DefaultBundle/IpV4Packet.hh
+++ b/Packets/DefaultBundle/IpV4Packet.hh
@@ -1,4 +1,4 @@
-// $Id$
+// $Id: IpV4Packet.hh 307 2007-07-14 21:31:12Z g0dil $
 //
 // Copyright (C) 2006
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
@@ -24,55 +24,54 @@
 #define HH_IpV4Packet_ 1
 
 // Custom includes
-#include "Packets/Packet.hh"
+#include "Packets/PacketType.hh"
 #include "Packets/ParseInt.hh"
-#include "Packets/ParseArray.hh"
 #include "Packets/PacketRegistry.hh"
+#include "Packets/PacketParser.hh"
 
 //#include "IpV4Packet.mpp"
 ///////////////////////////////hh.p////////////////////////////////////////
 
 namespace senf {
 
+    ///\addtogroup protocolbundle_default
+    ///@{
 
-    template <class Iterator=nil, class IpV4Packet=nil>
-    struct Parse_IpV4 : public ParserBase<Iterator,IpV4Packet>
+    struct Parse_IpV4 : public PacketParserBase
     {
-        template <class I, class P=nil>
-        struct rebind { typedef Parse_IpV4<I,P> parser; };
-        typedef Iterator byte_iterator;
-
-        Parse_IpV4() {}
-        Parse_IpV4(Iterator const & i) : ParserBase<Iterator,IpV4Packet>(i) {}
-
-        static unsigned bytes() { return 20; }
+        SENF_PACKET_PARSER_NO_INIT(Parse_IpV4);
 
         ///////////////////////////////////////////////////////////////////////////
 
-        typedef Parse_UIntField <  0,  4, Iterator > Parse_Version;
-        typedef Parse_UIntField <  4,  8, Iterator > Parse_IHL;
-        typedef Parse_UInt8     <         Iterator > Parse_8bit;
-        typedef Parse_UInt16    <         Iterator > Parse_16bit;
-        typedef Parse_Flag      <  0,     Iterator > Parse_R;
-        typedef Parse_Flag      <  1,     Iterator > Parse_DF;
-        typedef Parse_Flag      <  2,     Iterator > Parse_MF;
-        typedef Parse_UIntField <  3, 16, Iterator > Parse_Frag;
-        typedef Parse_UInt32    <         Iterator > Parse_32bit;
-
-        Parse_Version  version()     const { return Parse_Version (this->i()      ); }
-        Parse_IHL      ihl()         const { return Parse_IHL     (this->i()      ); }
-        Parse_8bit     tos()         const { return Parse_8bit    (this->i() + 1  ); }
-        Parse_16bit    length()      const { return Parse_16bit   (this->i() + 2  ); }
-        Parse_16bit    identifier()  const { return Parse_16bit   (this->i() + 4  ); }
-        Parse_R        reserved()    const { return Parse_R       (this->i() + 6  ); }
-        Parse_DF       df()          const { return Parse_DF      (this->i() + 6  ); }
-        Parse_MF       mf()          const { return Parse_MF      (this->i() + 6  ); }
-        Parse_Frag     frag()        const { return Parse_Frag    (this->i() + 6  ); }
-        Parse_8bit     ttl()         const { return Parse_8bit    (this->i() + 8  ); }
-        Parse_8bit     protocol()    const { return Parse_8bit    (this->i() + 9  ); }
-        Parse_16bit    crc()         const { return Parse_16bit   (this->i() + 10 ); }
-        Parse_32bit    source()      const { return Parse_32bit   (this->i() + 12 ); }
-        Parse_32bit    destination() const { return Parse_32bit   (this->i() + 16 ); }
+        typedef Parse_UIntField <  0,  4 > Parse_Version;
+        typedef Parse_UIntField <  4,  8 > Parse_IHL;
+        typedef Parse_UInt8                Parse_8bit;
+        typedef Parse_UInt16               Parse_16bit;
+        typedef Parse_Flag      <  0     > Parse_R;
+        typedef Parse_Flag      <  1     > Parse_DF;
+        typedef Parse_Flag      <  2     > Parse_MF;
+        typedef Parse_UIntField <  3, 16 > Parse_Frag;
+        typedef Parse_UInt32               Parse_32bit;
+
+        SENF_PACKET_PARSER_DEFINE_FIXED_FIELDS(
+            ((OverlayField)( version,     Parse_Version ))
+            ((Field       )( ihl,         Parse_IHL     ))
+            ((Field       )( tos,         Parse_8bit    ))
+            ((Field       )( length,      Parse_16bit   ))
+            ((Field       )( identifier,  Parse_16bit   ))
+            ((OverlayField)( reserved,    Parse_R       ))
+            ((OverlayField)( df,          Parse_DF      ))
+            ((OverlayField)( mf,          Parse_MF      ))
+            ((Field       )( frag,        Parse_Frag    ))
+            ((Field       )( ttl,         Parse_8bit    ))
+            ((Field       )( protocol,    Parse_8bit    ))
+            ((Field       )( crc,         Parse_16bit   ))
+            ((Field       )( source,      Parse_32bit   ))
+            ((Field       )( destination, Parse_32bit   )) );
+
+        void init() {
+            version() = 4;
+        }
     };
 
     struct IpTypes {
@@ -81,37 +80,35 @@ namespace senf {
         typedef boost::uint16_t key_t;
     };
 
-    class IpV4Packet
-        : public Packet,
-          public Parse_IpV4<Packet::iterator,IpV4Packet>,
-          public PacketRegistryMixin<IpTypes,IpV4Packet>
+    struct IpV4PacketType
+        : public PacketTypeBase,
+          public PacketTypeMixin<IpV4PacketType, IpTypes>
     {
-        using PacketRegistryMixin<IpTypes,IpV4Packet>::registerInterpreter;
-    public:
-        ///////////////////////////////////////////////////////////////////////////
-        // Types
+        typedef PacketTypeMixin<IpV4PacketType, IpTypes> mixin;
+        typedef ConcretePacket<IpV4PacketType> packet;
+        typedef Parse_IpV4 parser;
 
-        typedef ptr_t<IpV4Packet>::ptr ptr;
+        using mixin::nextPacketRange;
+        using mixin::nextPacketType;
+        using mixin::initSize;
+        using mixin::init;
 
-        ///////////////////////////////////////////////////////////////////////////
+        static registry_key_t nextPacketKey(packet p) 
+            { return p->protocol(); }
 
-    private:
-        template <class Arg>
-        IpV4Packet(Arg const & arg);
-
-        virtual void v_nextInterpreter() const;
-        virtual void v_finalize();
-        virtual void v_dump(std::ostream & os) const;
-
-        friend class Packet;
+        static void dump(packet p, std::ostream & os);
     };
+        
+    typedef IpV4PacketType::packet IpV4Packet;
+
+    ///@}
 }
 
 
 ///////////////////////////////hh.e////////////////////////////////////////
 //#include IpV4Packet.cci"
 //#include "IpV4Packet.ct"
-#include "IpV4Packet.cti"
+//#include "IpV4Packet.cti"
 #endif
 
 
@@ -122,4 +119,5 @@ namespace senf {
 // indent-tabs-mode: nil
 // ispell-local-dictionary: "american"
 // compile-command: "scons -u test"
+// comment-column: 40
 // End: