X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80211Bundle%2FRadiotapPacket.cc;h=7fd01cfacee356680b9058477191db03b6e3fee9;hb=4a99bad0289a65567e85cb51bd357a34562b2c04;hp=028c9c14d45f78bdf473f74f68c562477f8ae792;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc
index 028c9c1..7fd01cf 100644
--- a/senf/Packets/80211Bundle/RadiotapPacket.cc
+++ b/senf/Packets/80211Bundle/RadiotapPacket.cc
@@ -20,51 +20,46 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Definition of non-inline non-template functions
+// Definition of RadiotapPacket non-inline non-template functions
 
-// Custom includes
 #include "RadiotapPacket.hh"
+//#include "RadiotapPacket.ih"
+
+// Custom includes
 #include "WLANPacket.hh"
-#include "../../Packets/Packets.hh"
 #include <boost/io/ios_state.hpp>
 
 #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::RadiotapPacketType::dump(packet p, std::ostream &os)
 {
     boost::io::ios_all_saver ias(os);
     os << "Radiotap:\n"
-       <<     "  version                 : " << unsigned( p->version()) << "\n"
-       <<     "  length                  : " << unsigned( p->length()) << "\n";
-    if (p->has_tsft())
-        os << "  MAC timestamp           : " << unsigned( p->tsft()) << "\n";
-    // TODO: flags
-    if (p->has_rate())
-        os << "  rate                    : " << unsigned( p->rate()) << "\n";
-    // TODO: channelOptions
-    if (p->has_fhss())
-        os << "  FHSS                    : " << unsigned( p->fhss()) << "\n";
-    if (p->has_dbmAntennaSignal())
-        os << "  antenna signal (dBm)    : " << signed( p->dbmAntennaSignal()) << "\n";
-    if (p->has_dbmAntennaNoise())
-        os << "  antenna noise (dBm)     : " << signed( p->dbmAntennaNoise()) << "\n";
-    if (p->has_lockQuality())
-        os << "  lock quality            : " << unsigned( p->lockQuality()) << "\n";
-    if (p->has_txAttenuation())
-        os << "  tx attenuation          : " << unsigned( p->txAttenuation()) << "\n";
-    if (p->has_dbTxAttenuation())
-        os << "  tx attenuation (dB)     : " << unsigned( p->dbTxAttenuation()) << "\n";
-    if (p->has_dbmTxAttenuation())
-        os << "  tx attenuation (dBm)    : " << signed( p->dbmTxAttenuation()) << "\n";
-    if (p->has_antenna())
-        os << "  antenna                 : " << unsigned( p->antenna()) << "\n";
-    if (p->has_dbAntennaSignal())
-        os << "  antenna signal (dB)     : " << unsigned( p->dbAntennaSignal()) << "\n";
-    if (p->has_dbAntennaNoise())
-        os << "  antenna noise (dB)      : " << unsigned( p->dbAntennaNoise()) << "\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"                 );
+    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( 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 << "  FCS                     : " << unsigned( p->fcs()) << "\n";
+        os << senf::fieldName("FCS")     << unsigned( p->fcs()) << "\n";
 }
 
 prefix_ void senf::RadiotapPacketType::finalize(packet p)
@@ -91,4 +86,16 @@ senf::RadiotapPacketType::nextPacketRange(packet p)
         : optional_range( range(p.data().begin() + h, p.data().end() - t) );
 }
 
+///////////////////////////////cc.e////////////////////////////////////////
 #undef prefix_
+
+
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
+// End: