Packets: Fix VariantParser invalid parser access bug

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

diff --git a/Packets/DefaultBundle/LlcSnapPacket.hh b/Packets/DefaultBundle/LlcSnapPacket.hh
index c021c9f..037b61f 100644 (file)
--- a/Packets/DefaultBundle/LlcSnapPacket.hh
+++ b/Packets/DefaultBundle/LlcSnapPacket.hh
@@ -1,9 +1,9 @@
-// $id: EthernetPacket.hh 299 2007-07-10 21:23:49Z g0dil $
+// $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
@@ -23,8 +23,8 @@
 /** \file
     \brief LLC/SNAP public header */
 
-#ifndef HH_LlcSnapPacket_
-#define HH_LlcSnapPacket_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_LlcSnapPacket_
+#define HH_SENF_Packets_DefaultBundle_LlcSnapPacket_ 1
 
 // Custom includes
 #include <algorithm>
@@ -40,18 +40,18 @@ namespace senf {
         
         \todo document me
      */
-    struct Parse_LlcSnapPacket : public PacketParserBase
+    struct LlcSnapPacketParser : 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( dsap, UInt8Parser );
+        SENF_PARSER_FIELD( ssap, UInt8Parser );
+        SENF_PARSER_FIELD( ctrl, UInt8Parser );
 
-        SENF_PARSER_FIELD( protocolId, Parse_UInt24 );
-        SENF_PARSER_FIELD( type_length, Parse_UInt16 );
+        SENF_PARSER_FIELD( protocolId, UInt24Parser );
+        SENF_PARSER_FIELD( type_length, UInt16Parser );
 
-        SENF_PARSER_FINALIZE(Parse_LlcSnapPacket);
+        SENF_PARSER_FINALIZE(LlcSnapPacketParser);
         
         SENF_PARSER_INIT() {
             dsap() = 0xaa;
@@ -69,7 +69,7 @@ namespace senf {
             \ref LlcSnapPacketType
 
         \par Fields:
-            \ref Parse_LlcSnapPacket
+            \ref LlcSnapPacketParser
 
         \par Associated registries:
             \ref EtherTypes
@@ -86,7 +86,7 @@ namespace senf {
 #ifndef DOXYGEN
         typedef PacketTypeMixin<LlcSnapPacketType, EtherTypes> mixin;
         typedef ConcretePacket<LlcSnapPacketType> packet;
-        typedef Parse_LlcSnapPacket parser;
+        typedef LlcSnapPacketParser parser;
 #endif
         using mixin::nextPacketRange;
         using mixin::initSize;