X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FEthernetPacket.hh;h=3dcddc6f4fef53ea4743c80dbe54b5e7162342d5;hb=6a3a31fb7b2d2a5e8ae6d67d50797700274fb34e;hp=04516dbcccf7072c685614535f8630d977623f88;hpb=54eed72c506b09ef5b4be0b62fecedfbc0e3f261;p=senf.git

diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index 04516db..3dcddc6 100644
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -70,9 +70,9 @@ namespace senf {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSE_FIELD( destination, Parse_MAC    );
-        SENF_PARSE_FIELD( source,      Parse_MAC    );
-        SENF_PARSE_FIELD( type,        Parse_UInt16 );
+        SENF_PARSER_FIELD( destination, Parse_MAC    );
+        SENF_PARSER_FIELD( source,      Parse_MAC    );
+        SENF_PARSER_FIELD( type_length, Parse_UInt16 );
 
         SENF_PARSER_FINALIZE(Parse_Ethernet);
     };
@@ -100,32 +100,32 @@ namespace senf {
         \par Associated registries:
             \ref EtherTypes
 
+        \par Finalize action:
+            Set \a type from type of next packet if found in \ref EtherTypes
+
         \ingroup protocolbundle_default
      */
     struct EthernetPacketType
         : public PacketTypeBase,
           public PacketTypeMixin<EthernetPacketType, EtherTypes>
     {
+#ifndef DOXYGEN
         typedef PacketTypeMixin<EthernetPacketType, EtherTypes> mixin;
         typedef ConcretePacket<EthernetPacketType> packet;
         typedef Parse_Ethernet parser;
-
+#endif
         using mixin::nextPacketRange;
-        using mixin::nextPacketType;
+  //      using mixin::nextPacketType;
         using mixin::initSize;
         using mixin::init;
 
-        /** \todo Add LLC/SNAP support -> only use the registry
-            for type() values >=1536, otherwise expect an LLC header */
-        static registry_key_t nextPacketKey(packet p) 
-            { return p->type(); }
-
+        static factory_t nextPacketType(packet p);
         static void dump(packet p, std::ostream & os);
         static void finalize(packet p);
     };
 
     /** \brief Ethernet packet typedef */
-    typedef EthernetPacketType::packet EthernetPacket;
+    typedef ConcretePacket<EthernetPacketType> EthernetPacket;
 
     /** \brief Parse an ethernet VLAN tag
         
@@ -137,11 +137,11 @@ namespace senf {
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSE_BITFIELD( priority,  3, unsigned );
-        SENF_PARSE_BITFIELD( cfi,       1, bool     );
-        SENF_PARSE_BITFIELD( vlanId,   12, unsigned );
+        SENF_PARSER_BITFIELD( priority,  3, unsigned );
+        SENF_PARSER_BITFIELD( cfi,       1, bool     );
+        SENF_PARSER_BITFIELD( vlanId,   12, unsigned );
 
-        SENF_PARSE_FIELD( type, Parse_UInt16 );
+        SENF_PARSER_FIELD( type, Parse_UInt16 );
 
         SENF_PARSER_FINALIZE(Parse_EthVLan);
     };
@@ -157,16 +157,20 @@ namespace senf {
         \par Associated registries:
             \ref EtherTypes
 
+        \par Finalize action:
+            Set \a type from type of next packet if found in \ref EtherTypes
+
         \ingroup protocolbundle_default
      */
     struct EthVLanPacketType
         : public PacketTypeBase, 
           public PacketTypeMixin<EthVLanPacketType, EtherTypes>
     {
+#ifndef DOXYGEN
         typedef PacketTypeMixin<EthVLanPacketType, EtherTypes> mixin;
         typedef ConcretePacket<EthVLanPacketType> packet;
         typedef Parse_EthVLan parser;
-
+#endif
         using mixin::nextPacketRange;
         using mixin::nextPacketType;
         using mixin::initSize;
@@ -182,7 +186,70 @@ namespace senf {
     };
 
     /** \brief Ethernet VLAN tag typedef */
-    typedef EthVLanPacketType::packet EthVLanPacket;
+    typedef ConcretePacket<EthVLanPacketType> EthVLanPacket;
+
+
+    /** \brief Parse an ethernet LLC/SNAP header
+        
+        \todo document me
+
+        \see EthVLanPacketType
+     */
+    struct Parse_EthLlcSnapPacket : public PacketParserBase
+    {
+#       include SENF_FIXED_PARSER()
+
+        SENF_PARSER_FIELD( dsap, Parse_UInt8 );
+        SENF_PARSER_FIELD( ssap, Parse_UInt8 );
+        SENF_PARSER_FIELD( ctrl, Parse_UInt8 );
+
+        SENF_PARSER_FIELD( protocolId, Parse_UInt24 );
+        SENF_PARSER_FIELD( type, Parse_UInt24 );
+
+        SENF_PARSER_FINALIZE(Parse_EthLlcSnapPacket);
+    };
+
+    /** \brief Ethernet LLC/SNAP header
+
+        \todo document me
+
+        \par Packet type (typedef):
+            \ref EthLlcSnapPacketType
+
+        \par Fields:
+            \ref Parse_EthLlcSnapPacket
+
+        \par Associated registries:
+            \ref EtherTypes
+
+        \par Finalize action:
+            XXXX
+
+        \ingroup protocolbundle_default
+     */
+    struct EthLlcSnapPacketType
+        : public PacketTypeBase, 
+          public PacketTypeMixin<EthLlcSnapPacketType, EtherTypes>
+    {
+#ifndef DOXYGEN
+        typedef PacketTypeMixin<EthLlcSnapPacketType, EtherTypes> mixin;
+        typedef ConcretePacket<EthLlcSnapPacketType> packet;
+        typedef Parse_EthLlcSnapPacket parser;
+#endif
+        using mixin::nextPacketRange;
+        using mixin::nextPacketType;
+        using mixin::initSize;
+        using mixin::init;
+                
+        static registry_key_t nextPacketKey(packet p) 
+            { return p->type(); }
+
+        static void dump(packet p, std::ostream & os);
+        static void finalize(packet p);
+    };
+
+    /** \brief Ethernet VLAN tag typedef */
+    typedef ConcretePacket<EthLlcSnapPacketType> EthLlcSnapPacket;
 }