switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/DefaultBundle/NDPOptions.hh b/senf/Packets/DefaultBundle/NDPOptions.hh
index cefce55..e3e1b46 100644 (file)
--- a/senf/Packets/DefaultBundle/NDPOptions.hh
+++ b/senf/Packets/DefaultBundle/NDPOptions.hh
@@ -1,24 +1,29 @@
-// $Id: ICMPv6TypePacket.hh 1449 2009-09-25 23:03:48Z g0dil $
+// $Id$
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Sauer <ssauer@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):
+//   Stefan Sauer <ssauer@berlios.de>
 
 // Definition of non-inline non-template functions
 
@@ -28,9 +33,11 @@
 // Custom includes
 #include <senf/Packets/Packets.hh>
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
-#include <senf/Packets/DefaultBundle/ListOptionTypeParser.hh>
+#include <senf/Packets/DefaultBundle/IPv6Packet.hh>
 
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace senf {
+
     //#############################################################
     //ICMPv6 Neighbor Discovery (RFC 4861) Options
     //#############################################################
@@ -44,11 +51,21 @@ namespace senf {
 
         typedef GenericTLVParserRegistry<NDPOptionParser> Registry;
     };
-    typedef GenericTLVParserBase<NDPOptionParser> NDPGenericOptionParser;
+
+    struct NDPGenericOptionParser : public GenericTLVParserBase<NDPOptionParser>
+    {
+        typedef GenericTLVParserBase<NDPOptionParser> base;
+        NDPGenericOptionParser(data_iterator i, state_type s) : base(i,s) {}
+
+        senf::PacketParserBase::size_type bytes() const
+        {
+            return length()*8;
+        }
+    };
 
     struct NDPSourceLLAddressTLVParser : public NDPOptionParser
     {
-#      include SENF_PARSER()
+#       include SENF_PARSER()
         SENF_PARSER_INHERIT  ( NDPOptionParser );
         SENF_PARSER_FIELD    ( source, MACAddressParser);
         SENF_PARSER_FINALIZE ( NDPSourceLLAddressTLVParser);
@@ -64,7 +81,7 @@ namespace senf {
 
     struct NDPTargetLLAddressTLVParser : public NDPOptionParser
     {
-#      include SENF_PARSER()
+#       include SENF_PARSER()
         SENF_PARSER_INHERIT  ( NDPOptionParser );
         SENF_PARSER_FIELD    ( target, MACAddressParser );
         SENF_PARSER_FINALIZE ( NDPTargetLLAddressTLVParser );
@@ -74,13 +91,17 @@ namespace senf {
             type() = typeId;
             length() = 1;
         }
-        static const UInt8Parser::value_type typeId = 0x02;
+
+        senf::PacketParserBase::size_type bytes(NDPTargetLLAddressTLVParser p) {
+                    return length()*8;
+        }
+        static const type_t::value_type typeId = 0x02;
         void dump(std::ostream & os) const;
     };
 
     struct NDPPrefixInformationTLVParser : public NDPOptionParser
     {
-#      include SENF_PARSER()
+#       include SENF_PARSER()
         SENF_PARSER_INHERIT          ( NDPOptionParser );
         SENF_PARSER_FIELD            ( prefixLength, UInt8Parser );
         SENF_PARSER_BITFIELD         ( l, 1, bool );
@@ -99,13 +120,16 @@ namespace senf {
             reserved1() = 0;
             reserved2() = 0;
         }
+        senf::PacketParserBase::size_type bytes(NDPPrefixInformationTLVParser p) {
+            return length()*8;
+        }
         static const UInt8Parser::value_type typeId = 0x03;
         void dump(std::ostream & os) const;
     };
 
     struct NDPMTUTLVParser : public NDPOptionParser
     {
-#      include SENF_PARSER()
+#       include SENF_PARSER()
         SENF_PARSER_INHERIT          ( NDPOptionParser );
         SENF_PARSER_PRIVATE_BITFIELD ( reserved, 16, unsigned );
         SENF_PARSER_FIELD            ( mtu, UInt32Parser );
@@ -122,9 +146,13 @@ namespace senf {
     };
 }
 
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
+//#include "NDPOptions.cci"
+//#include "NDPOptions.ct"
+//#include "NDPOptions.cti"
 #endif
 
-
+\f
 // Local Variables:
 // mode: c++
 // fill-column: 100