From: g0dil Date: Fri, 20 Aug 2010 06:40:18 +0000 (+0000) Subject: Packets/80211Bundle: Complete radiotap dump (incl. unit-test) X-Git-Url: http://g0dil.de/git?a=commitdiff_plain;h=9bc655e14d2d8c204ed835896cb51e42d49bd68f;p=senf.git Packets/80211Bundle: Complete radiotap dump (incl. unit-test) git-svn-id: https://svn.berlios.de/svnroot/repos/senf/trunk@1692 270642c3-0616-0410-b53a-bc976706d245 --- diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc index ceff474..7c6d84a 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.cc @@ -39,6 +39,7 @@ extern "C" { 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, @@ -46,13 +47,10 @@ prefix_ void senf::RadiotapPacketParser::fillOffsetTable(boost::uint8_t * data, 0); while (ieee80211_radiotap_iterator_next(&iter)==0) { if (iter.is_radiotap_ns && - iter.this_arg_index <= int(senf::RadiotapPacketParser::MAX_INDEX)) { + iter.this_arg_index <= int(senf::RadiotapPacketParser::MAX_INDEX)) table[iter.this_arg_index] = iter.this_arg - data; - std::cerr << ">> " << iter.this_arg_index << " " << table[iter.this_arg_index] << "\n"; - } } table[MAX_INDEX+1] = iter.this_arg - data + iter.this_arg_size; - std::cerr << ">> size " << table[MAX_INDEX+1] << "\n"; } prefix_ senf::RadiotapPacketParser::OffsetTable const & @@ -71,20 +69,60 @@ senf::RadiotapPacketParser::offsetTable(boost::uint32_t presentFlags) } -#define DUMP_OPTIONAL_FIELD(name, sign, desc) \ - if (p->name ## Present()) \ - os << senf::fieldName(desc) << sign(p->name()) \ - << std::endl; - 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)" ); @@ -96,14 +134,17 @@ prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os) DUMP_OPTIONAL_FIELD( dbAntennaSignal, unsigned, "antenna signal (dB)" ); DUMP_OPTIONAL_FIELD( dbAntennaNoise, unsigned, "antenna noise (dB)" ); DUMP_OPTIONAL_FIELD( headerFcs, unsigned, "FCS (in header)" ); + if (p->flagsPresent() && p->flags().fcsAtEnd()) - os << senf::fieldName("FCS (at end)") << unsigned(p->fcs()) << "\n"; + os << senf::fieldName("FCS (at end)") << unsigned(p->fcs()) << '\n'; + +# undef DUMP_OPTIONAL_FIELD } -#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(); } diff --git a/senf/Packets/80211Bundle/RadiotapPacket.test.cc b/senf/Packets/80211Bundle/RadiotapPacket.test.cc index 91c1e80..46f8a63 100644 --- a/senf/Packets/80211Bundle/RadiotapPacket.test.cc +++ b/senf/Packets/80211Bundle/RadiotapPacket.test.cc @@ -24,6 +24,7 @@ \brief RadiotapPacket unit tests */ // Custom includes +#include #include "RadiotapPacket.hh" #include @@ -95,8 +96,23 @@ SENF_AUTO_UNIT_TEST(RadiotapPacket_packet) BOOST_CHECK_EQUAL( p->channelOptions().halfRateChannel(), false); BOOST_CHECK_EQUAL( p->channelOptions().quarterRateChannel(), false); - std::ostringstream oss (std::ostringstream::out); - SENF_CHECK_NO_THROW( p.dump( oss)); + /* dump */ + std::stringstream ss; + p.dump(ss); + BOOST_CHECK_EQUAL( ss.str(), + "Radiotap:\n" + " version : 0\n" + " length : 26\n" + " MAC timestamp : 81059833346\n" + " flags : FCSatEnd ShortPreamble \n" + " rate : 12\n" + " channel frequency : 5320\n" + " channel flags : OFDM 5GHz \n" + " antenna signal (dBm) : -61\n" + " antenna noise (dBm) : -96\n" + " antenna : 2\n" + " antenna signal (dB) : 35\n" + " FCS (at end) : 0\n" ); } #if 0