switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/80211Bundle/InformationElements.hh b/senf/Packets/80211Bundle/InformationElements.hh
index af497b2..6cf2b79 100644 (file)
--- a/senf/Packets/80211Bundle/InformationElements.hh
+++ b/senf/Packets/80211Bundle/InformationElements.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief WLAN Information Elements public header */
@@ -30,7 +35,7 @@
 #include <senf/Packets/Packets.hh>
 
 //#include "InformationElements.mpp"
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace senf {
 
@@ -41,10 +46,12 @@ namespace senf {
         SENF_PARSER_FIELD    ( type,   UInt8Parser   );
         SENF_PARSER_FIELD    ( length, UInt8Parser   );
         SENF_PARSER_FINALIZE ( WLANInfoElementParser );
+
+        typedef GenericTLVParserRegistry<WLANInfoElementParser> Registry;
     };
 
     typedef GenericTLVParserBase<WLANInfoElementParser> WLANGenericInfoElementParser;
-    
+
     struct WLANSSIDInfoElementParser
         : public WLANInfoElementParser
     {
@@ -54,33 +61,33 @@ namespace senf {
         SENF_PARSER_GOTO     ( length                           );
         SENF_PARSER_FIELD    ( value, StringParser<UInt8Parser> );
         SENF_PARSER_FINALIZE ( WLANSSIDInfoElementParser        );
-     
+
         SENF_PARSER_INIT() {
             type() = typeId;
-        }        
+        }
         static const type_t::value_type typeId = 0x00u;
-        
+
         void dump(std::ostream & os) const;
     };
-        
+
     struct WLANSupportedRatesInfoElementParser
         : public WLANInfoElementParser
     {
     #   include SENF_PARSER()
         SENF_PARSER_INHERIT  ( WLANInfoElementParser               );
-        // we just skip the value here. If somebody needs the information he has to implement 
-        // this strange information element hisself. 
+        // we just skip the value here. If somebody needs the information he has to implement
+        // this strange information element himself.
         SENF_PARSER_SKIP     ( length(), 0                         );
         SENF_PARSER_FINALIZE ( WLANSupportedRatesInfoElementParser );
-     
+
         SENF_PARSER_INIT() {
             type() = typeId;
-        }        
+        }
         static const type_t::value_type typeId = 0x01u;
-        
+
         void dump(std::ostream & os) const;
     };
-        
+
     struct WLANPowerConstraintInfoElementParser
         : public WLANInfoElementParser
     {
@@ -88,18 +95,18 @@ namespace senf {
         SENF_PARSER_INHERIT  ( WLANInfoElementParser                );
         SENF_PARSER_FIELD    ( value,   UInt8Parser                 );
         SENF_PARSER_FINALIZE ( WLANPowerConstraintInfoElementParser );
-     
+
         SENF_PARSER_INIT() {
             type() = typeId;
             length() = 1;
-        }        
+        }
         static const type_t::value_type typeId = 0x20u;
-        
+
         void dump(std::ostream & os) const;
     };
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 //#include "InformationElements.cci"
 //#include "InformationElements.ct"
 //#include "InformationElements.cti"