X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.hh;h=04e1f9c308367db15591303e67eaa0f3939d549f;hb=refs%2Fheads%2Fmaster;hp=c6a0e7287bd3d884c86f0a3529f95eaac817e5d2;hpb=7661548b20e6c7627f54bff87e0758396fd523ef;p=senf.git

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh
index c6a0e72..04e1f9c 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.hh
+++ b/senf/Packets/80211Bundle/RadiotapPacket.hh
@@ -2,24 +2,29 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Christian Niephaus <cni@berlios.de>
-//     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>
+//   Christian Niephaus <cni@berlios.de>
 
 /** \file
     \brief Radiotap header */
@@ -53,7 +58,7 @@ namespace senf {
 
         SENF_PARSER_FINALIZE ( RadiotapPacketParser_Flags );
 
-        friend class RadiotapPacketParser;
+        friend struct RadiotapPacketParser;
     };
 
     /** \brief Parse in Radiotap Header channel frequency and flag field
@@ -266,6 +271,7 @@ namespace senf {
         static const size_type fixed_bytes = 0; // hide this member, just in case
 
         typedef boost::array<size_type,MAX_INDEX+2> OffsetTable;
+        typedef std::map<boost::uint32_t, OffsetTable> OffsetMap;
 
         //-////////////////////////////////////////////////////////////////////////
         // Offset table handling
@@ -291,9 +297,10 @@ namespace senf {
         void updatePresentFlags(boost::uint32_t flags);
         void insertRemoveBytes(unsigned from, unsigned to, int bytes);
 
+        static OffsetMap offsetMap_;
         OffsetTable const * currentTable_;
 
-        friend class RadiotapPacketType;
+        friend struct RadiotapPacketType;
     };
 
     /** \brief Radiotap packet
@@ -317,13 +324,12 @@ namespace senf {
         typedef ConcretePacket<RadiotapPacketType> packet;
         typedef RadiotapPacketParser parser;
 
-        using mixin::init;
         using mixin::initSize;
 
-        static void dump(packet p, std::ostream &os);
-        static void finalize(packet p);
+        static void init(packet p);
+        static void dump(packet p, std::ostream & os);
         static factory_t nextPacketType(packet p);
-        static optional_range nextPacketRange(packet p);
+        static optional_range nextPacketRange(packet const & p);
     };
 
     typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;