switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/DefaultBundle/ICMPv6Packet.hh b/senf/Packets/DefaultBundle/ICMPv6Packet.hh
index bc7d9c2..9d31dcd 100644 (file)
--- a/senf/Packets/DefaultBundle/ICMPv6Packet.hh
+++ b/senf/Packets/DefaultBundle/ICMPv6Packet.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Philipp Batroff <pug@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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Philipp Batroff <pug@berlios.de>
 
 /** \file
     \brief ICMPv6Packet public header */
@@ -27,11 +32,11 @@
 #define HH_SENF_Packets_DefaultBundle_ICMPv6Packet_ 1
 
 // Custom includes
-#include "../../Packets/Packets.hh"
+#include <senf/Packets/Packets.hh>
 
 //#include "ICMPv6Packet.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
-namespace senf 
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+namespace senf
 {
     struct ICMPv6PacketParser : public PacketParserBase
     {
@@ -39,15 +44,15 @@ namespace senf
         SENF_PARSER_FIELD ( type,     UInt8Parser  );
         SENF_PARSER_FIELD ( code,     UInt8Parser  );
         SENF_PARSER_FIELD ( checksum, UInt16Parser );
-    
+
         SENF_PARSER_FINALIZE ( ICMPv6PacketParser );
-        
+
         boost::uint16_t calcChecksum() const;
     };
-    
+
     struct ICMPTypes {
         // ICMP type registry
-        typedef boost::uint16_t key_t;
+        typedef boost::uint8_t key_t;
     };
 
     /** \brief ICMP Packet for IPv6
@@ -58,41 +63,44 @@ namespace senf
         \par Fields:
             \ref ICMPv6PacketParser
             \image html ICMPv6Packet.png
-        
+
         \par Associated registries:
             \ref ICMPTypes
 
         \ingroup protocolbundle_default
      */
-    struct ICMPv6PacketType 
+    struct ICMPv6PacketType
         : public PacketTypeBase,
           public PacketTypeMixin<ICMPv6PacketType, ICMPTypes>
     {
         typedef PacketTypeMixin<ICMPv6PacketType, ICMPTypes> mixin;
         typedef ConcretePacket<ICMPv6PacketType> packet;
         typedef ICMPv6PacketParser parser;
-        
+
         using mixin::nextPacketRange;
         using mixin::nextPacketType;
         using mixin::init;
         using mixin::initSize;
-        
+
         static void dump(packet p, std::ostream & os);
-        
-        static key_t nextPacketKey(packet p) { 
+
+        static key_t nextPacketKey(packet p) {
             return p->type();
         }
-        
+
         static void finalize(packet p) {
-            p->checksum() << p->calcChecksum();
             p->type() << key(p.next(senf::nothrow));
+            p->checksum() << p->calcChecksum();
         }
     };
-    
+
+    /** \brief ICMPv6 packet typedef
+        \ingroup protocolbundle_default
+     */
     typedef ConcretePacket<ICMPv6PacketType> ICMPv6Packet;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "IPv4Packet.cci"
 //#include "IPv4Packet.ct"
 //#include "IPv4Packet.cti"