switch to new MPL based Fraunhofer FOKUS Public License

[senf.git] / senf / Packets / 80211Bundle / WLANPacket.hh

diff --git a/senf/Packets/80211Bundle/WLANPacket.hh b/senf/Packets/80211Bundle/WLANPacket.hh
index 814263e..0db8889 100644 (file)
--- a/senf/Packets/80211Bundle/WLANPacket.hh
+++ b/senf/Packets/80211Bundle/WLANPacket.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Christian Niephaus <cni@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):
+//   Christian Niephaus <cni@berlios.de>
 
 /** \file
     \brief 802.11 WLANPacket public header */
@@ -30,7 +35,7 @@
 #include <senf/Packets/DefaultBundle/EthernetPacket.hh>
 #include <senf/Packets/DefaultBundle/LlcSnapPacket.hh>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf
 {
@@ -66,7 +71,7 @@ namespace senf
         SENF_PARSER_FINALIZE(WLANPacketParser);
     };
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Management frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -120,7 +125,7 @@ namespace senf
         using mixin::initSize;
         using PacketTypeBase::nextPacketRange;
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
     /** \brief WLAN Management frame packet typedef
@@ -128,7 +133,7 @@ namespace senf
      */
     typedef WLANPacket_MgtFrameType::packet WLANPacket_MgtFrame;
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Control frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -178,7 +183,7 @@ namespace senf
         using mixin::initSize;
         using PacketTypeBase::nextPacketRange;
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
     /** \brief WLAN Control frame packet typedef
@@ -186,7 +191,7 @@ namespace senf
      */
     typedef WLANPacket_CtrlFrameType::packet WLANPacket_CtrlFrame;
 
-    ///////////////////////////////////////////////////////////////////////////
+    //-////////////////////////////////////////////////////////////////////////
 
     /** \brief Data frame parser
         <b>Re-ordering of bits due to LSB byte order</b>
@@ -282,7 +287,7 @@ namespace senf
                 : no_factory();
         }
 
-        static void dump(packet p, std::ostream &os);
+        static void dump(packet p, std::ostream & os);
     };
 
     /** \brief WLAN Data frame packet typedef
@@ -291,7 +296,7 @@ namespace senf
     typedef WLANPacket_DataFrameType::packet WLANPacket_DataFrame;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "WLANPacket.cci"
 //#include "WLANPacket.ct"
 //#include "WLANPacket.cti"