X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.cc;h=7c6d84a5c0528680cd4b9ba77b7554cde41dcaea;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=7fd01cfacee356680b9058477191db03b6e3fee9;hpb=d827fa2c49602de3e7d9559810408f258b5987ba;p=senf.git

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc
index 7fd01cf..7c6d84a 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.cc
+++ b/senf/Packets/80211Bundle/RadiotapPacket.cc
@@ -29,41 +29,122 @@
 #include "WLANPacket.hh"
 #include <boost/io/ios_state.hpp>
 
+extern "C" {
+#   include "radiotap/radiotap_iter.h"
+}
+
 #define prefix_
 ///////////////////////////////cc.p//////////////////////////////////////
 
-namespace {
-    #define DUMP_OPTIONAL_FIELD(name, sign, desc)           \
-        if (p->has_##name())                                \
-            os << senf::fieldName(desc) << sign( p->name()) \
-               << std::endl;
+prefix_ void senf::RadiotapPacketParser::fillOffsetTable(boost::uint8_t * data, int maxLength,
+                                                         OffsetTable & table)
+{
+    memset(&table, 0, sizeof(table));
+    struct ieee80211_radiotap_iterator iter;
+    ieee80211_radiotap_iterator_init(&iter,
+                                     (struct ieee80211_radiotap_header *)data,
+                                     maxLength,
+                                     0);
+    while (ieee80211_radiotap_iterator_next(&iter)==0) {
+        if (iter.is_radiotap_ns &&
+            iter.this_arg_index <= int(senf::RadiotapPacketParser::MAX_INDEX))
+            table[iter.this_arg_index] = iter.this_arg - data;
+    }
+    table[MAX_INDEX+1] = iter.this_arg - data + iter.this_arg_size;
 }
 
+prefix_ senf::RadiotapPacketParser::OffsetTable const &
+senf::RadiotapPacketParser::offsetTable(boost::uint32_t presentFlags)
+{
+    typedef std::map<boost::uint32_t, OffsetTable> OffsetMap;
+    static OffsetMap offsetMap;
+
+    OffsetMap::iterator i (offsetMap.find(presentFlags));
+    if (i == offsetMap.end()) {
+        OffsetTable table;
+        fillOffsetTable(&(*data().begin()), data().size(), table);
+        i = offsetMap.insert(std::make_pair(presentFlags, table)).first;
+    }
+    return i->second;
+}
+
+
 prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os)
 {
     boost::io::ios_all_saver ias(os);
     os << "Radiotap:\n"
-       << senf::fieldName("version") << unsigned( p->version()) << "\n"
-       << senf::fieldName("length")  << unsigned( p->length()) << "\n";
-    // TODO: flags, channelOptions
-    DUMP_OPTIONAL_FIELD( tsft,              unsigned, "MAC timestamp"        );
-    DUMP_OPTIONAL_FIELD( rate,              unsigned, "rate"                 );
+       << senf::fieldName("version") << unsigned(p->version()) << '\n'
+       << senf::fieldName("length")  << unsigned(p->length()) << '\n';
+
+#   define DUMP_OPTIONAL_FIELD(name, sign, desc)                        \
+        if (p->name ## Present())                                       \
+            os << senf::fieldName(desc) << sign(p->name()) << '\n';
+
+    DUMP_OPTIONAL_FIELD( tsft, boost::uint64_t, "MAC timestamp" );
+
+    if (p->flagsPresent()) {
+        os << senf::fieldName("flags");
+
+#       define DUMP_FLAG(name,desc) if (p->flags().name()) os << desc " "
+        DUMP_FLAG(shortGI,            "ShortGI");
+        DUMP_FLAG(badFCS,             "BadFCS");
+        DUMP_FLAG(fcsAtEnd,           "FCSatEnd");
+        DUMP_FLAG(fragmentation,      "Frag");
+        DUMP_FLAG(wep,                "WEP");
+        DUMP_FLAG(shortPreamble,      "ShortPreamble");
+        DUMP_FLAG(cfp,                "CFP");
+#       undef DUMP_FLAG
+
+        os << '\n';
+    }
+
+    DUMP_OPTIONAL_FIELD( rate, unsigned, "rate" );
+
+    if (p->channelOptionsPresent()) {
+        os << senf::fieldName("channel frequency")
+           << unsigned(p->channelOptions().freq()) << '\n'
+           << senf::fieldName("channel flags");
+
+#       define DUMP_FLAG(name,desc) if (p->channelOptions().name()) os << desc " "
+        DUMP_FLAG(flag2ghz,           "2GHz");
+        DUMP_FLAG(ofdm,               "OFDM");
+        DUMP_FLAG(cck,                "CCK");
+        DUMP_FLAG(turbo,              "Turbo");
+        DUMP_FLAG(quarterRateChannel, "Rate/4");
+        DUMP_FLAG(halfRateChannel,    "Rate/2");
+        DUMP_FLAG(gsm,                "GSM");
+        DUMP_FLAG(staticTurbo,        "StaticTurbo");
+        DUMP_FLAG(gfsk,               "GFSK");
+        DUMP_FLAG(cckOfdm,            "CCKOFDM");
+        DUMP_FLAG(passive,            "Passive");
+        DUMP_FLAG(flag5ghz,           "5GHz");
+#       undef DUMP_FLAG
+
+        os << '\n';
+    }
+
     DUMP_OPTIONAL_FIELD( fhss,              unsigned, "FHSS"                 );
     DUMP_OPTIONAL_FIELD( dbmAntennaSignal,  signed,   "antenna signal (dBm)" );
     DUMP_OPTIONAL_FIELD( dbmAntennaNoise,   signed,   "antenna noise (dBm)"  );
-    DUMP_OPTIONAL_FIELD( lockQuality,       unsigned, "lock quality"         );    
+    DUMP_OPTIONAL_FIELD( lockQuality,       unsigned, "lock quality"         );
     DUMP_OPTIONAL_FIELD( txAttenuation,     unsigned, "tx attenuation"       );
     DUMP_OPTIONAL_FIELD( dbTxAttenuation,   unsigned, "tx attenuation (dB)"  );
     DUMP_OPTIONAL_FIELD( dbmTxAttenuation,  signed,   "tx attenuation (dBm)" );
     DUMP_OPTIONAL_FIELD( antenna,           unsigned, "antenna"              );
     DUMP_OPTIONAL_FIELD( dbAntennaSignal,   unsigned, "antenna signal (dB)"  );
     DUMP_OPTIONAL_FIELD( dbAntennaNoise,    unsigned, "antenna noise (dB)"   );
-    if (p->has_headerFcs())
-        os << senf::fieldName("FCS")     << unsigned( p->fcs()) << "\n";
+    DUMP_OPTIONAL_FIELD( headerFcs,         unsigned, "FCS (in header)"      );
+
+    if (p->flagsPresent() && p->flags().fcsAtEnd())
+        os << senf::fieldName("FCS (at end)") << unsigned(p->fcs()) << '\n';
+
+#   undef DUMP_OPTIONAL_FIELD
 }
 
+
 prefix_ void senf::RadiotapPacketType::finalize(packet p)
 {
+    ///\fixme Is this really correct ? shouldn't I use nextPacket.begin() - begin() here ?
     p->length() << p->calculateSize();
 }
 
@@ -81,8 +162,8 @@ senf::RadiotapPacketType::nextPacketRange(packet p)
 {
     size_type h (senf::bytes(p.parser()));
     size_type t (p->flagsPresent() && p->flags().fcsAtEnd() ? 4 : 0);
-    return p.size() < h+t 
-        ? no_range() 
+    return p.size() < h+t
+        ? no_range()
         : optional_range( range(p.data().begin() + h, p.data().end() - t) );
 }