X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FDefaultBundle%2FIPv6Extensions.hh;h=91ac6104a51dcd1412df4dbff8e3b432389cbe30;hb=adcd3672d48f44103f2b4abc6417acf5d0107978;hp=e351a43e26ee5608f67dad68f9dc0b0918c7656b;hpb=6116cb96ea7bdcb42b7d12165a05fcbe0687226d;p=senf.git

diff --git a/Packets/DefaultBundle/IPv6Extensions.hh b/Packets/DefaultBundle/IPv6Extensions.hh
index e351a43..91ac610 100644
--- a/Packets/DefaultBundle/IPv6Extensions.hh
+++ b/Packets/DefaultBundle/IPv6Extensions.hh
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2007
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -23,8 +23,8 @@
 /** \file
     \brief IPv6Extensions public header */
 
-#ifndef HH_IPv6Extensions_
-#define HH_IPv6Extensions_ 1
+#ifndef HH_SENF_Packets_DefaultBundle_IPv6Extensions_
+#define HH_SENF_Packets_DefaultBundle_IPv6Extensions_ 1
 
 // Custom includes
 #include "IPv6Packet.hh"
@@ -41,20 +41,20 @@ namespace senf {
         \see IPv6ExtensionType_Fragment \n
             <a href="http://tools.ietf.org/html/rfc2460">RFC 2460</a>
      */
-    struct Parse_IPv6Extension_Fragment : public PacketParserBase
+    struct IPv6PacketParserExtension_Fragment : public PacketParserBase
     {
 #       include SENF_FIXED_PARSER()
 
-        SENF_PARSER_FIELD( nextHeader     , Parse_UInt8 );
-        SENF_PARSER_FIELD( reserved1      , Parse_UInt8 );
+        SENF_PARSER_FIELD( nextHeader     , UInt8Parser );
+        SENF_PARSER_FIELD( reserved1      , UInt8Parser );
 
         SENF_PARSER_BITFIELD( fragmentOffset, 13, unsigned );
         SENF_PARSER_BITFIELD( reserved2,       2, unsigned );
         SENF_PARSER_BITFIELD( moreFragments,   1, bool     );
 
-        SENF_PARSER_FIELD( id             , Parse_UInt32   );
+        SENF_PARSER_FIELD( id             , UInt32Parser   );
 
-        SENF_PARSER_FINALIZE(Parse_IPv6Extension_Fragment);
+        SENF_PARSER_FINALIZE(IPv6PacketParserExtension_Fragment);
     };
 
     /** \brief IPv6 fragment extension
@@ -63,7 +63,7 @@ namespace senf {
             \ref IPv6Extension_Fragment
 
         \par Fields:
-            \ref Parse_IPv6Extension_Fragment
+            \ref IPv6PacketParserExtension_Fragment
         
         \par Associated registries:
             \par IpTypes
@@ -80,20 +80,20 @@ namespace senf {
 #ifndef DOXYGEN
         typedef PacketTypeMixin<IPv6ExtensionType_Fragment, IpTypes> mixin;
         typedef ConcretePacket<IPv6ExtensionType_Fragment> packet;
-        typedef Parse_IPv6Extension_Fragment parser;
+        typedef IPv6PacketParserExtension_Fragment parser;
 #endif
         using mixin::nextPacketRange;
         using mixin::nextPacketType;
         using mixin::initSize;
         using mixin::init;
 
-        static registry_key_t nextPacketKey(packet p) 
+        static key_t nextPacketKey(packet p) 
             { return p->nextHeader(); }
         
         static void dump(packet p, std::ostream & os);
 
         static void finalize(packet p)
-            { p->nextHeader() << key(p.next()); }
+            { p->nextHeader() << key(p.next(nothrow)); }
     };
 
     /** \brief IPv6 fragment extension packet typedef */