switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/Packets/80211Bundle/WLANPacket.cc b/senf/Packets/80211Bundle/WLANPacket.cc
index 47011b2..4d93652 100644 (file)
--- a/senf/Packets/80211Bundle/WLANPacket.cc
+++ b/senf/Packets/80211Bundle/WLANPacket.cc
@@ -2,23 +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>
 //
-// 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>
+
 
 // Definition of non-inline non-template functions
 
@@ -29,7 +35,7 @@
 #include <boost/io/ios_state.hpp>
 
 #define prefix_
-///////////////////////////////cc.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
     void dumpBase(senf::WLANPacketParser const & p, std::ostream & os)
@@ -48,17 +54,23 @@ namespace {
         if ( p.order()          ) os << " order";
 
         if ( !(p.toDS() || p.fromDS() || p.moreFrag() || p.retry() || p.pwrMgt() ||
-               p.moreData() || p.protectedFrame() || p.order()) ) 
+               p.moreData() || p.protectedFrame() || p.order()) )
             os << " none";
         os << "\n"
            << "  duration                : " << unsigned(p.duration()) << "\n";
     }
 }
 
-prefix_ void senf::WLANPacket_MgtFrameType::dump(packet p, std::ostream &os)
+prefix_ void senf::WLANPacket_MgtFrameParser::sequenceNumber(boost::uint16_t sn)
+{
+    seqNumber_2() = 0u | (sn >> 4 ) ;
+    seqNumber_1() = 0u | sn;
+}
+
+prefix_ void senf::WLANPacket_MgtFrameType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
-    os << "802.11 MAC Mangement Frame:\n";
+    os << "802.11 MAC Management Frame:\n";
     dumpBase(p.parser(), os);
     os << senf::fieldName("destination")           << p->destinationAddress() << "\n"
        << senf::fieldName("source")                << p->sourceAddress() << "\n"
@@ -67,7 +79,7 @@ prefix_ void senf::WLANPacket_MgtFrameType::dump(packet p, std::ostream &os)
        << senf::fieldName("fragment number")       << p->fragmentNumber() << "\n";
 }
 
-prefix_ void senf::WLANPacket_CtrlFrameType::dump(packet p, std::ostream &os)
+prefix_ void senf::WLANPacket_CtrlFrameType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "802.11 MAC Control Frame:\n";
@@ -77,14 +89,20 @@ prefix_ void senf::WLANPacket_CtrlFrameType::dump(packet p, std::ostream &os)
         os << senf::fieldName("source")                << p->sourceAddress() << "\n";
 }
 
+prefix_ void senf::WLANPacket_DataFrameParser::sequenceNumber(boost::uint16_t sn)
+{
+    seqNumber_2() = 0u | (sn >> 4 ) ;
+    seqNumber_1() = 0u | sn;
+}
+
 prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::destinationAddress()
     const
 {
     switch (dsBits()) {
     case 0 :
-    case 2 : 
+    case 2 :
         return addr1();
-    default: 
+    default:
         return addr3();
     }
 }
@@ -98,7 +116,7 @@ prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::sourceAddress()
         return addr2();
     // TODO wds frames
     // case 3 : return addr4();
-    default: 
+    default:
         return addr3();
     }
 }
@@ -116,7 +134,7 @@ prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::bssid()
     }
 }
 
-prefix_ void senf::WLANPacket_DataFrameType::dump(packet p, std::ostream &os)
+prefix_ void senf::WLANPacket_DataFrameType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "802.11 MAC Data Frame:\n";
@@ -137,7 +155,7 @@ prefix_ void senf::WLANPacket_DataFrameType::dump(packet p, std::ostream &os)
         os << senf::fieldName("QOS data")              << p->qosField() << "\n";
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f