X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FIPv6Packet.hh;h=cba84a20daf9cca134035393fa2f22e3f71636c9;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=251dfa7df01f94a17a8b82f5220f12c1718d15e3;hpb=57524bfa72e4536b15700a83eae94093ed32106a;p=senf.git

diff --git a/senf/Packets/DefaultBundle/IPv6Packet.hh b/senf/Packets/DefaultBundle/IPv6Packet.hh
index 251dfa7..cba84a2 100644
--- a/senf/Packets/DefaultBundle/IPv6Packet.hh
+++ b/senf/Packets/DefaultBundle/IPv6Packet.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // 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
-// 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 Bund <g0dil@berlios.de>
 
 /** \file
     \brief IPv6Packet public header */
@@ -32,29 +37,23 @@
 #include "IPv4Packet.hh"
 
 //#include "IPv6Packet.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
     /** \brief Parse an IPv6 address
-        
+
         \see INet6Address
      */
-    struct INet6AddressParser : public PacketParserBase
+    struct INet6AddressParser
+        : public ValueParserBase<INet6AddressParser, INet6Address, 16u>
     {
-        INet6AddressParser(data_iterator i, state_type s) : PacketParserBase(i,s,fixed_bytes) {}
-
-        ///////////////////////////////////////////////////////////////////////////
-
-        typedef INet6Address value_type;
-        static const size_type fixed_bytes = 16u;
+        INet6AddressParser(data_iterator i, state_type s) : Base(i,s) {}
 
         value_type value() const { return value_type::from_data(i()); }
         void value(value_type const & v) { std::copy(v.begin(), v.end(), i()); }
-        operator value_type() const { return value(); }
-        byte & operator[](size_type index) const { return *boost::next(i(),index); }
-        INet6AddressParser const & operator= (value_type const & other) 
-            { value(other); return *this; }
+
+        using Base::operator=;
     };
 
     /** \brief Parse an IPv6 packet
@@ -88,7 +87,7 @@ namespace senf {
 
         \par Packet type (typedef):
             \ref IPv6Packet
-        
+
         \par Fields:
             \ref IPv6PacketParser
 
@@ -114,7 +113,7 @@ namespace senf {
               \ref IPv6PacketParser::destination()  "Destination Address"</td>
           </tr>
         </table>
-          
+
         \par Associated registries:
             \ref IpTypes
 
@@ -138,17 +137,17 @@ namespace senf {
         using mixin::initSize;
         using mixin::init;
 
-        static key_t nextPacketKey(packet p) 
+        static key_t nextPacketKey(packet p)
             { return p->nextHeader(); }
-        
+
         /** \brief Dump given IPv6Packet in readable form to given output stream */
-        static void dump(packet p, std::ostream & os); 
-        
+        static void dump(packet p, std::ostream & os);
+
         static void finalize(packet p); ///< Finalize packet.
-                                        /**< \li set \ref IPv6PacketParser::length() "length" 
+                                        /**< \li set \ref IPv6PacketParser::length() "length"
                                                from payload size
-                                             \li set \ref IPv6PacketParser::nextHeader() 
-                                               "nextHeader" from type of next packet if found 
+                                             \li set \ref IPv6PacketParser::nextHeader()
+                                               "nextHeader" from type of next packet if found
                                                in \ref IpTypes */
     };
 
@@ -158,7 +157,7 @@ namespace senf {
     typedef ConcretePacket<IPv6PacketType> IPv6Packet;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "IPv6Packet.cci"
 //#include "IPv6Packet.ct"
 //#include "IPv6Packet.cti"