Logger: use ClockService::now() as timeBase if empty timeFormat is given for a target

[senf.git] / senf / Packets / 80211Bundle / RadiotapPacket.cc

diff --git a/senf/Packets/80211Bundle/RadiotapPacket.cc b/senf/Packets/80211Bundle/RadiotapPacket.cc
index 3d17391..521301e 100644 (file)
--- a/senf/Packets/80211Bundle/RadiotapPacket.cc
+++ b/senf/Packets/80211Bundle/RadiotapPacket.cc
@@ -64,7 +64,7 @@ prefix_ void senf::RadiotapPacketParser::parseOffsetTable(boost::uint8_t * data,
     unsigned size (8u);
     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(RadiotapPacketParser::MAX_INDEX))
             table[iter.this_arg_index] = iter.this_arg - data;
         // We need to set size here in the loop since the iter fields are only valid
         // when at least one present bit is set ...
@@ -184,6 +184,7 @@ prefix_ void senf::RadiotapPacketParser::updatePresentFlags(boost::uint32_t flag
         cumulativeNewBytes += newBytes;
         b = newTable[index] + FIELD_SIZE[index];
     }
+    length() += cumulativeNewBytes;
     presentFlags() = flags;
     currentTable_ = &newTable;
 }
@@ -191,7 +192,7 @@ prefix_ void senf::RadiotapPacketParser::updatePresentFlags(boost::uint32_t flag
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::RadiotapPacketType
 
-prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os)
+prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream & os)
 {
     boost::io::ios_all_saver ias(os);
     os << "Radiotap:\n"
@@ -288,11 +289,11 @@ prefix_ void senf::RadiotapPacketType::dump(packet p, std::ostream &os)
 #   undef FIELD
 }
 
-
-prefix_ void senf::RadiotapPacketType::finalize(packet p)
+prefix_ void senf::RadiotapPacketType::init(packet p)
 {
-    ///\fixme Is this really correct ? shouldn't I use nextPacket.begin() - begin() here ?
-    p->length() << p->calculateSize();
+    // ?? Why the heck do we need the +0? Otherwise we get an
+    // 'undefined reference to 'RadiotapPacketParser_Header::fixed_bytes'
+    p->length() << RadiotapPacketParser_Header::fixed_bytes+0;
 }
 
 prefix_ senf::PacketInterpreterBase::factory_t senf::RadiotapPacketType::nextPacketType(packet p)