X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2F80211Bundle%2FRadiotapPacket.cc;h=bf4407c08071fa3b37c45ce41e32061444ec36e3;hb=bd9f9d3fd6fbcff0112a7bf48ab9284da9576b11;hp=a67514c125fd163ed3cade1389e0050a662973a4;hpb=c1a83da548df3b5cb63e201465f1b9cd79e320ed;p=senf.git

diff --git a/Packets/80211Bundle/RadiotapPacket.cc b/Packets/80211Bundle/RadiotapPacket.cc
index a67514c..bf4407c 100644
--- a/Packets/80211Bundle/RadiotapPacket.cc
+++ b/Packets/80211Bundle/RadiotapPacket.cc
@@ -34,24 +34,42 @@
 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_dbmAntennaSignal())
-        os  << "  Signal              : " << signed (p-> dbmAntennaSignal()) << "\n";
+    os << "Radiotap:\n"
+       << "  Version             : " << unsigned( p->version()) << "\n"
+       << "  Length              : " << unsigned( p->length()) << "\n";
     if (p->has_tsft())
-        os  << "  MAC timestamp       : " << unsigned (p->tsft()) << "\n";
+        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  << "  Noise               : " << signed (p-> dbmAntennaNoise()) << "\n";
-
-
-
+        os  << "  Antenna Noise (dBm) : " << signed( p->dbmAntennaNoise()) << "\n";
+    if (p->has_lockQuality())
+        os  << "  Lock Quality        : " << unsigned( p->lockQuality()) << "\n";
+    if (p->has_txAttenuation())
+        os  << "  txAttenuation       : " << unsigned( p->txAttenuation()) << "\n";
+    if (p->has_dbTxAttenuation())
+        os  << "  dbTxAttenuation     : " << unsigned( p->dbTxAttenuation()) << "\n";
+    if (p->has_dbmTxAttenuation())
+        os  << "  dbmTxAttenuation    : " << 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";
+    if (p->has_fcs())
+        os  << "  FCS                 : " << unsigned( p->fcs()) << "\n";
 }
 
 prefix_ void senf::RadiotapPacketType::finalize(packet p)
 {
-    //TODO
-    p->length() << p.size();
+    p->length() << senf::bytes( p.parser());
 }
 
 prefix_ senf::PacketInterpreterBase::factory_t senf::RadiotapPacketType::nextPacketType(packet p)