some clean-ups

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

diff --git a/Packets/80211Bundle/WLANPacket.cc b/Packets/80211Bundle/WLANPacket.cc
index ff4f271..33a2809 100644 (file)
--- a/Packets/80211Bundle/WLANPacket.cc
+++ b/Packets/80211Bundle/WLANPacket.cc
@@ -1,9 +1,9 @@
-// $Id: $
+// $Id$
 //
-// Copyright (C) 2006
+// Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Christian Niephaus <christian.niephaus@fokus.fraunhofer.de>
+//     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
@@ -30,12 +30,7 @@
 
 #define prefix_
 
-namespace
-{
-
-}
-
-prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::da()
+prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::da()
     const
 {
     switch (dsBits())
@@ -49,9 +44,12 @@ prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::da()
         return addr3();
         break;
     }
+    //just to avoid compiler warning
+    //TODO
+    return addr1();
 }
 
-prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::sa()
+prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::sa()
     const
 {
     switch (dsBits())
@@ -67,9 +65,12 @@ prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::sa()
 //    case 3:
 //        return addr4();
     }
+    //just to avoid compiler warning
+    //TODO
+    return addr1();
 }
 
-prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::bssid()
+prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::bssid()
     const
 {
     switch (dsBits())
@@ -83,10 +84,13 @@ prefix_ senf::MACAddressParser senf::WLANPacketParser_DataFrameParser::bssid()
     case 2:
         return addr2();
     }
+    //just to avoid compiler warning
+    //TODO
+    return addr1();
 }
 
 //shift some bits to read the 12bit sequence number bit field in LSB byte order
-prefix_ boost::uint16_t senf::WLANPacketParser_MgtFrameParser::sequenceNumber()
+prefix_ boost::uint16_t senf::WLANPacket_MgtFrameParser::sequenceNumber()
     const
 {
     boost::uint16_t seqN = 0;
@@ -97,7 +101,7 @@ prefix_ boost::uint16_t senf::WLANPacketParser_MgtFrameParser::sequenceNumber()
 }
 
 //shift some bits to read the 12bit sequence number bit field in LSB byte order
-prefix_ boost::uint16_t senf::WLANPacketParser_DataFrameParser::sequenceNumber()
+prefix_ boost::uint16_t senf::WLANPacket_DataFrameParser::sequenceNumber()
     const
 {
     boost::uint16_t seqN = 0;
@@ -118,9 +122,9 @@ prefix_ void senf::WLANPacketType::dump(packet p, std::ostream &os)
 
     if (p->has_mgtFrame())
     {
-        os << "  BSSID              : " << p->mgtFrame().bssid() << "\n";
-        os << "  Destination Addr.  : " << p->mgtFrame().da() << "\n";
-        os << "  Source Addr.  : " << p->mgtFrame().sa() << "\n";
+        os << "  BSSID               : " << p->mgtFrame().bssid() << "\n";
+        os << "  Destination Address : " << p->mgtFrame().destinationAddress() << "\n";
+        os << "  Source Address      : " << p->mgtFrame().sourceAddress() << "\n";
     }
 
 };