// Fraunhofer Institute for Open Communication Systems (FOKUS)
// Competence Center NETwork research (NET), St. Augustin, GERMANY
// Christian Niephaus <cni@berlios.de>
+// Stefan Bund <g0dil@berlios.de>
//
// This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
}
#define prefix_
-///////////////////////////////cc.p//////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// Offset table management
prefix_ senf::RadiotapPacketParser::OffsetTable &
parseOffsetTable((boost::uint8_t*)&header, header.it_len, table);
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::RadiotapPacketParser
unsigned const senf::RadiotapPacketParser_Header::FIELD_SIZE[] = {
cumulativeNewBytes += newBytes;
b = newTable[index] + FIELD_SIZE[index];
}
+ length() += cumulativeNewBytes;
presentFlags() = flags;
currentTable_ = &newTable;
}
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
// senf::RadiotapPacketType
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)
prefix_ senf::RadiotapPacketType::optional_range
senf::RadiotapPacketType::nextPacketRange(packet p)
{
- size_type h (senf::bytes(p.parser()));
- size_type t (p->flagsPresent() && p->flags().fcsAtEnd() ? 4 : 0);
+ parser rtParser (p.parser());
+ size_type h (senf::bytes(rtParser));
+ size_type t (rtParser.flagsPresent() && rtParser.flags().fcsAtEnd() ? 4 : 0);
return p.size() <= h+t
? no_range()
: optional_range( range(p.data().begin() + h, p.data().end() - t) );
}
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
#undef prefix_
\f