set keyword-property

[senf.git] / Packets / DefaultBundle / EthernetPacket.hh

diff --git a/Packets/DefaultBundle/EthernetPacket.hh b/Packets/DefaultBundle/EthernetPacket.hh
index 98d09ab..635f43b 100644 (file)
--- a/Packets/DefaultBundle/EthernetPacket.hh
+++ b/Packets/DefaultBundle/EthernetPacket.hh
@@ -3,7 +3,7 @@
 // Copyright (C) 2006
 // Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
 // Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+//     Thorsten Horstmann <thorsten.horstmann@fokus.fraunhofer.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
@@ -72,7 +72,7 @@ namespace senf {
 
         SENF_PARSER_FIELD( destination, Parse_MAC    );
         SENF_PARSER_FIELD( source,      Parse_MAC    );
-        SENF_PARSER_FIELD( type,        Parse_UInt16 );
+        SENF_PARSER_FIELD( type_length, Parse_UInt16 );
 
         SENF_PARSER_FINALIZE(Parse_Ethernet);
     };
@@ -115,15 +115,10 @@ namespace senf {
         typedef Parse_Ethernet parser;
 #endif
         using mixin::nextPacketRange;
-        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);
     };
@@ -191,8 +186,8 @@ namespace senf {
 
     /** \brief Ethernet VLAN tag typedef */
     typedef ConcretePacket<EthVLanPacketType> EthVLanPacket;
-}
 
+}
 
 ///////////////////////////////hh.e////////////////////////////////////////
 #endif