some unimportant clean-ups ;)

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

diff --git a/Packets/80211Bundle/WLANPacket.cc b/Packets/80211Bundle/WLANPacket.cc
index c4c6512..675a09b 100644 (file)
--- a/Packets/80211Bundle/WLANPacket.cc
+++ b/Packets/80211Bundle/WLANPacket.cc
@@ -81,27 +81,6 @@ prefix_ senf::MACAddressParser senf::WLANPacket_DataFrameParser::bssid()
     return addr1();
 }
 
-//shift some bits to read the 12bit sequence number bit field in LSB byte order
-prefix_ boost::uint16_t senf::WLANPacket_MgtFrameParser::sequenceNumber()
-    const
-{
-    boost::uint16_t seqN = 0;
-    seqN |= seqNumber_2();
-    seqN <<= 4;
-    seqN |= seqNumber_1();
-    return seqN;
-}
-
-//shift some bits to read the 12bit sequence number bit field in LSB byte order
-prefix_ boost::uint16_t senf::WLANPacket_DataFrameParser::sequenceNumber()
-    const
-{
-    boost::uint16_t seqN = 0;
-    seqN |= seqNumber_2();
-    seqN <<= 4;
-    seqN |= seqNumber_1();
-    return seqN;
-}
 
 prefix_ void senf::WLANPacketType::dump(packet p, std::ostream &os)
 {
@@ -112,7 +91,7 @@ prefix_ void senf::WLANPacketType::dump(packet p, std::ostream &os)
        << "  Retransmission : " << unsigned( p->retry()) << "\n"
        << "  Duration       : " << unsigned( p->duration()) << "\n";
     if (p->is_mgtFrame()) {
-        os << "  Management-Frame:\n" 
+        os << "  Management-Frame:\n"
            << "    BSSID               : " << p->mgtFrame().bssid() << "\n"
            << "    Destination Address : " << p->mgtFrame().destinationAddress() << "\n"
            << "    Source Address      : " << p->mgtFrame().sourceAddress() << "\n"
@@ -130,8 +109,8 @@ prefix_ void senf::WLANPacketType::dump(packet p, std::ostream &os)
     }
     if (p->is_dataFrame()) {
         os << "  Data-Frame:\n"
-           << "    Sequence Number     : " << unsigned( p->mgtFrame().sequenceNumber()) << "\n"
-           << "    Fragment Number     : " << unsigned( p->mgtFrame().fragmentNumber()) << "\n";
+           << "    Sequence Number     : " << unsigned( p->dataFrame().sequenceNumber()) << "\n"
+           << "    Fragment Number     : " << unsigned( p->dataFrame().fragmentNumber()) << "\n";
     }
 };