X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.hh;h=c375a56509adf0294a1894d7eaa8007bc79d4a7c;hb=e3179a2123ad51d0d9eb63834a581145c4f77c92;hp=f6bd76e793cd2c347ba9ec700f3a47db81f94457;hpb=01e8fa6cf173c60c3deb47c29c6d56718ef9548e;p=senf.git

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.hh b/senf/Packets/80211Bundle/RadiotapPacket.hh
index f6bd76e..c375a56 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.hh
+++ b/senf/Packets/80211Bundle/RadiotapPacket.hh
@@ -4,6 +4,7 @@
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Christian Niephaus <cni@berlios.de>
+//     Stefan Bund <g0dil@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,7 +31,7 @@
 #include <senf/Packets/Packets.hh>
 #include <boost/array.hpp>
 
-///////////////////////////////hh.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace senf {
 
     /** \brief Parse Flag field in Radiotap header
@@ -135,41 +136,6 @@ namespace senf {
         SENF_PARSER_FIELD ( length,  UInt16LSBParser );
 
         SENF_PARSER_PRIVATE_FIELD ( presentFlags, UInt32LSBParser );
-        SENF_PARSER_GOTO( presentFlags );
-
-        // present flags indicate which data fields are contained in the packet
-        // BEWARE: LSB-first bit-order !!
-
-        // index: 7 - 0
-        SENF_PARSER_BITFIELD_RO ( lockQualityPresent,      1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbmAntennaNoisePresent,  1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbmAntennaSignalPresent, 1, bool );
-        SENF_PARSER_BITFIELD_RO ( fhssPresent,             1, bool );
-        SENF_PARSER_BITFIELD_RO ( channelOptionsPresent,   1, bool );
-        SENF_PARSER_BITFIELD_RO ( ratePresent,             1, bool );
-        SENF_PARSER_BITFIELD_RO ( flagsPresent,            1, bool );
-        SENF_PARSER_BITFIELD_RO ( tsftPresent,             1, bool );
-
-        // index: 15 - 8
-        SENF_PARSER_BITFIELD_RO ( txFlagsPresent,          1, bool );
-        SENF_PARSER_BITFIELD_RO ( rxFlagsPresent,          1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbAntennaNoisePresent,   1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbAntennaSignalPresent,  1, bool );
-        SENF_PARSER_BITFIELD_RO ( antennaPresent,          1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbmTxAttenuationPresent, 1, bool );
-        SENF_PARSER_BITFIELD_RO ( dbTxAttenuationPresent,  1, bool );
-        SENF_PARSER_BITFIELD_RO ( txAttenuationPresent,    1, bool );
-
-        // index: 23 - 16
-        SENF_PARSER_SKIP_BITS   ( 6                                );
-        SENF_PARSER_BITFIELD_RO ( dataRetriesPresent,      1, bool );
-        SENF_PARSER_BITFIELD_RO ( rtsRetriesPresent,       1, bool );
-
-        // index: 31 - 24
-        SENF_PARSER_BITFIELD_RO ( extendedBitmaskPresent,  1, bool );
-        SENF_PARSER_BITFIELD_RO ( vendorNamespacePresent,  1, bool );
-        SENF_PARSER_BITFIELD_RO ( resetRadiotapNamespace,  1, bool )
-        SENF_PARSER_SKIP_BITS   ( 5                                );
 
         SENF_PARSER_FINALIZE ( RadiotapPacketParser_Header );
 
@@ -195,7 +161,11 @@ namespace senf {
             RTS_RETRIES_INDEX       = 16,
             DATA_RETRIES_INDEX      = 17,
 
-            MAX_INDEX               = 17
+            MAX_INDEX               = 17,
+
+            RADIOTOP_NS_INDEX       = 29,
+            VENDOR_NS_INDEX         = 30,
+            EXTENDED_BITMASK_INDEX  = 31
         };
 
         enum PresentFlag {
@@ -216,7 +186,11 @@ namespace senf {
             RX_FLAGS_FLAG           = (1<<RX_FLAGS_INDEX),
             TX_FLAGS_FLAG           = (1<<TX_FLAGS_INDEX),
             RTS_RETRIES_FLAG        = (1<<RTS_RETRIES_INDEX),
-            DATA_RETRIES_FLAG       = (1<<DATA_RETRIES_INDEX)
+            DATA_RETRIES_FLAG       = (1<<DATA_RETRIES_INDEX),
+
+            RADIOTOP_NS_FLAG        = (1<<RADIOTOP_NS_INDEX),
+            VENDOR_NS_FLAG          = (1<<VENDOR_NS_INDEX),
+            EXTENDED_BITMASK_FLAG   = (1<<EXTENDED_BITMASK_INDEX)
         };
 
         static unsigned const FIELD_SIZE[MAX_INDEX+2];
@@ -241,12 +215,13 @@ namespace senf {
 
         size_type bytes() const;
 
-        // ////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
 
 #       define FIELD(name,type,index)                                   \
             typedef type name ## _t;                                    \
             type name() { return parseField<type>(index); }             \
-            bool has_ ## name() { return name ## Present(); }           \
+            bool has_ ## name() { return currentTable()[index]; }       \
+            bool name ## Present() { return has_ ## name(); }           \
             type init_ ## name() { initField(index); return name(); }   \
             void disable_ ## name() { disableField(index); }
 
@@ -255,7 +230,8 @@ namespace senf {
         // flags is special: disabling 'flags' must also disable the 'fcs' field
         typedef RadiotapPacketParser_Flags flags_t;
         flags_t flags() { return parseField<flags_t>(FLAGS_INDEX); }
-        bool has_flags() { return flagsPresent(); }
+        bool has_flags() { return currentTable()[FLAGS_INDEX]; }
+        bool flagsPresent() { return has_flags(); }
         flags_t init_flags() { initField(FLAGS_INDEX); return flags(); }
         void disable_flags() { disable_fcs(); disableField(FLAGS_INDEX); }
 
@@ -291,7 +267,7 @@ namespace senf {
 
         typedef boost::array<size_type,MAX_INDEX+2> OffsetTable;
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
         // Offset table handling
 
         static OffsetTable & offsetTable(boost::uint32_t presentFlags);
@@ -300,7 +276,7 @@ namespace senf {
         // Generate an offset table just from the present flags
         static void buildOffsetTable(boost::uint32_t presentFlags, OffsetTable & table);
 
-        ///////////////////////////////////////////////////////////////////////////
+        //-////////////////////////////////////////////////////////////////////////
 
         OffsetTable const & currentTable() const;
         OffsetTable const & getTable(boost::uint32_t presentFlags) const;
@@ -315,6 +291,8 @@ namespace senf {
         void updatePresentFlags(boost::uint32_t flags);
         void insertRemoveBytes(unsigned from, unsigned to, int bytes);
 
+        OffsetTable const * currentTable_;
+
         friend class RadiotapPacketType;
     };
 
@@ -339,11 +317,10 @@ namespace senf {
         typedef ConcretePacket<RadiotapPacketType> packet;
         typedef RadiotapPacketParser parser;
 
-        using mixin::init;
         using mixin::initSize;
 
-        static void dump(packet p, std::ostream &os);
-        static void finalize(packet p);
+        static void init(packet p);
+        static void dump(packet p, std::ostream & os);
         static factory_t nextPacketType(packet p);
         static optional_range nextPacketRange(packet p);
     };
@@ -351,7 +328,7 @@ namespace senf {
     typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;
 }
 
-///////////////////////////////hh.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #include "RadiotapPacket.cci"
 //#include "RadiotapPacket.ct"
 #include "RadiotapPacket.cti"