X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.hh;h=c1e9a91a00b6ef3183f4896ca9d2508fc997656a;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=e59f02dbcbda06b91ca98d4aec21add217effc1a;hpb=ec082e2ded82e26d02f7aa72da519cbadcb601ec;p=senf.git

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh
index e59f02d..c1e9a91 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 */
@@ -31,7 +36,7 @@
 #include <senf/Packets/Packets.hh>
 #include <boost/array.hpp>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace senf {
 
     /** \brief Parse Flag field in Radiotap header
@@ -215,7 +220,7 @@ namespace senf {
 
         size_type bytes() const;
 
-        // ////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
 
 #       define FIELD(name,type,index)                                   \
             typedef type name ## _t;                                    \
@@ -267,7 +272,7 @@ namespace senf {
 
         typedef boost::array<size_type,MAX_INDEX+2> OffsetTable;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Offset table handling
 
         static OffsetTable & offsetTable(boost::uint32_t presentFlags);
@@ -276,7 +281,7 @@ namespace senf {
         // Generate an offset table just from the present flags
         static void buildOffsetTable(boost::uint32_t presentFlags, OffsetTable & table);
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
 
         OffsetTable const & currentTable() const;
         OffsetTable const & getTable(boost::uint32_t presentFlags) const;
@@ -317,11 +322,10 @@ 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);
     };
@@ -329,7 +333,7 @@ namespace senf {
     typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "RadiotapPacket.cci"
 //#include "RadiotapPacket.ct"
 #include "RadiotapPacket.cti"