From: tho <tho@270642c3-0616-0410-b53a-bc976706d245>
Date: Wed, 19 Jan 2011 09:56:19 +0000 (+0000)
Subject: Packets/80211Bundle: RadiotapPacket fixed undefined reference bug with debug=1
X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=7224b2e8773bc3187f94b8c30e52e2ecf775281e;p=senf.git

Packets/80211Bundle: RadiotapPacket fixed undefined reference bug with debug=1

git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1766 270642c3-0616-0410-b53a-bc976706d245
---

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc
index d732aad..d9d97bc 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.cc
+++ b/senf/Packets/80211Bundle/RadiotapPacket.cc
@@ -291,7 +291,9 @@ prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os)
 
 prefix_ void senf::RadiotapPacketType::init(packet p)
 {
-    p->length() << RadiotapPacketParser_Header::fixed_bytes;
+    // ?? Why the heck do we need the +0? Otherwise we get an
+    // 'undefined reference to 'RadiotapPacketParser_Header::fixed_bytes'
+    p->length() << RadiotapPacketParser_Header::fixed_bytes+0;
 }
 
 prefix_ senf::PacketInterpreterBase::factory_t senf::RadiotapPacketType::nextPacketType(packet p)
diff --git a/senf/Packets/80211Bundle/RadiotapPacket.test.cc b/senf/Packets/80211Bundle/RadiotapPacket.test.cc
index e05f3e8..11118b0 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.test.cc
+++ b/senf/Packets/80211Bundle/RadiotapPacket.test.cc
@@ -301,7 +301,7 @@ SENF_AUTO_UNIT_TEST(RadiotapPacket_parsetest)
                       "  antenna                 : 1\n"
                       "  rx flags                : \n"
                       "  fcs                     : 240700832\n"
-                      "802.11 MAC Mangement Frame:\n"
+                      "802.11 MAC Management Frame:\n"
                       "  version                 : 0\n"
                       "  type                    : 0\n"
                       "  subtype                 : 8\n"
diff --git a/senf/Packets/80211Bundle/WLANPacket.cc b/senf/Packets/80211Bundle/WLANPacket.cc
index f59acbc..fd3355a 100644
--- a/senf/Packets/80211Bundle/WLANPacket.cc
+++ b/senf/Packets/80211Bundle/WLANPacket.cc
@@ -64,7 +64,7 @@ prefix_ void senf::WLANPacket_MgtFrameParser::sequenceNumber(boost::uint16_t 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"