// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
/** \file
- \brief Radiotap header \n
- <b>Radiotap uses least significant bit byte order</b>
- */
+ \brief Radiotap header */
#ifndef HH_SENF_Packets_80211Bundle_RadiotapPacket_
#define HH_SENF_Packets_80211Bundle_RadiotapPacket_ 1
{
/** \brief Parse Flag field in Radiotap header
- * <b>Re-ordering of bits due to LSB byte order</b>
- * (see http://www.radiotap.org/)
+ <b>Re-ordering of bits due to LSB byte order</b>
*/
- struct RadiotapPacketParser_Flags : public senf::PacketParserBase
+ struct RadiotapPacketParser_Flags : public PacketParserBase
{
# include SENF_FIXED_PARSER()
SENF_PARSER_BITFIELD ( shortGI, 1, bool );
SENF_PARSER_BITFIELD ( badFCS, 1, bool );
SENF_PARSER_BITFIELD ( padding, 1, bool );
- SENF_PARSER_BITFIELD ( fcsPresent, 1, bool );
+ SENF_PARSER_BITFIELD_RO ( fcsAtEnd, 1, bool ); // Cannot change this (change packet size)
SENF_PARSER_BITFIELD ( fragmentation, 1, bool );
SENF_PARSER_BITFIELD ( wep, 1, bool );
SENF_PARSER_BITFIELD ( shortPreamble, 1, bool );
<b>Re-ordering of bits due to LSB byte order</b>
*/
- struct RadiotapPacketParser_ChannelOptions : public senf::PacketParserBase
+ struct RadiotapPacketParser_ChannelOptions : public PacketParserBase
{
# include SENF_FIXED_PARSER()
\todo extended present field (bit 31 of present field is set)
*/
- struct RadiotapPacketParser : public senf::PacketParserBase
+ struct RadiotapPacketParser : public PacketParserBase
{
# include SENF_PARSER()
SENF_PARSER_BITFIELD_RO ( flagsPresent, 1, bool );
SENF_PARSER_BITFIELD_RO ( tsftPresent, 1, bool );
SENF_PARSER_SKIP_BITS ( 1 ); //currently unused bits
- SENF_PARSER_BITFIELD_RO ( fcsPresent, 1, bool );
+ SENF_PARSER_BITFIELD_RO ( headerFcsPresent, 1, bool );
SENF_PARSER_BITFIELD_RO ( dbAntennaNoisePresent, 1, bool );
SENF_PARSER_BITFIELD_RO ( dbAntennaSignalPresent, 1, bool );
SENF_PARSER_BITFIELD_RO ( antennaPresent, 1, bool );
SENF_PARSER_BITFIELD ( extendedBitmaskPresent, 1, bool );
SENF_PARSER_SKIP_BITS ( 7 ); //currently unused bits
+ SENF_PARSER_LABEL( headerEnd_ );
+
/*
* Radiotap data
* parsing data according to present flags
#define OPTIONAL_FIELD(name, parser) SENF_PARSER_VARIANT \
( name##_, name##Present, \
( novalue( disable_##name, VoidPacketParser )) \
- ( id( name, parser )) );
+ ( id( name, parser )) )
/* macro to create padding parser */
#define SKIP_OPTIONAL_PADDING(cond, parser, size) \
(cond ? (size - (parser##__offset() + \
senf::bytes(parser##_())) % size) % size : 0) , 0 );
- OPTIONAL_FIELD ( tsft, UInt64LSBParser );
- OPTIONAL_FIELD ( flags, RadiotapPacketParser_Flags );
- OPTIONAL_FIELD ( rate, UInt8Parser );
- SKIP_OPTIONAL_PADDING ( channelOptionsPresent(), rate, 2 );
- OPTIONAL_FIELD ( channelOptions, RadiotapPacketParser_ChannelOptions ) ;
- SKIP_OPTIONAL_PADDING ( fhssPresent(), channelOptions, 2 );
- OPTIONAL_FIELD ( fhss, UInt16LSBParser );
- OPTIONAL_FIELD ( dbmAntennaSignal, Int8Parser );
- OPTIONAL_FIELD ( dbmAntennaNoise, Int8Parser );
- SKIP_OPTIONAL_PADDING ( lockQualityPresent(), dbmAntennaNoise, 2 );
- OPTIONAL_FIELD ( lockQuality, UInt16LSBParser );
- SKIP_OPTIONAL_PADDING ( txAttenuationPresent(), lockQuality, 2 );
- OPTIONAL_FIELD ( txAttenuation, UInt16LSBParser );
- SKIP_OPTIONAL_PADDING ( dbTxAttenuationPresent(), txAttenuation, 2 );
- OPTIONAL_FIELD ( dbTxAttenuation, UInt16LSBParser );
- OPTIONAL_FIELD ( dbmTxAttenuation, Int8Parser );
- OPTIONAL_FIELD ( antenna, UInt8Parser );
- OPTIONAL_FIELD ( dbAntennaSignal, UInt8Parser );
- OPTIONAL_FIELD ( dbAntennaNoise, UInt8Parser );
- SKIP_OPTIONAL_PADDING ( fcsPresent(), dbAntennaNoise, 4 );
- OPTIONAL_FIELD ( fcs, UInt32Parser );
+ OPTIONAL_FIELD ( tsft, UInt64LSBParser );
+ OPTIONAL_FIELD ( flags, RadiotapPacketParser_Flags ); //<pkgdraw: size=8
+ OPTIONAL_FIELD ( rate, UInt8Parser );
+ SKIP_OPTIONAL_PADDING ( channelOptionsPresent(), rate, 2 );
+ OPTIONAL_FIELD ( channelOptions, RadiotapPacketParser_ChannelOptions ); //<pkgdraw: size=32
+ SKIP_OPTIONAL_PADDING ( fhssPresent(), channelOptions, 2 );
+ OPTIONAL_FIELD ( fhss, UInt16LSBParser );
+ OPTIONAL_FIELD ( dbmAntennaSignal, Int8Parser );
+ OPTIONAL_FIELD ( dbmAntennaNoise, Int8Parser );
+ SKIP_OPTIONAL_PADDING ( lockQualityPresent(), dbmAntennaNoise, 2 );
+ OPTIONAL_FIELD ( lockQuality, UInt16LSBParser );
+ SKIP_OPTIONAL_PADDING ( txAttenuationPresent(), lockQuality, 2 );
+ OPTIONAL_FIELD ( txAttenuation, UInt16LSBParser );
+ SKIP_OPTIONAL_PADDING ( dbTxAttenuationPresent(), txAttenuation, 2 );
+ OPTIONAL_FIELD ( dbTxAttenuation, UInt16LSBParser );
+ OPTIONAL_FIELD ( dbmTxAttenuation, Int8Parser );
+ OPTIONAL_FIELD ( antenna, UInt8Parser );
+ OPTIONAL_FIELD ( dbAntennaSignal, UInt8Parser );
+ OPTIONAL_FIELD ( dbAntennaNoise, UInt8Parser );
+ SKIP_OPTIONAL_PADDING ( headerFcsPresent(), dbAntennaNoise, 4 );
+ OPTIONAL_FIELD ( headerFcs, UInt32Parser );
+
+ SENF_PARSER_LABEL( packetEnd_ );
+
+ size_type calculateSize() { return packetEnd__offset(); }
+
+ // Ouch ... changing the flags().fcsAtEnd() field needs to resize the packet ... !!!
+ // Need to think, if I can do this with a variant parser ...
+ SENF_PARSER_CUSTOM_FIELD( fcs, senf::UInt32Parser, 0, 0 ) {
+ return parse<senf::UInt32Parser>(data().end()-4);
+ }
SENF_PARSER_INIT() {
version() = 0;
}
- SENF_PARSER_FINALIZE(RadiotapPacketParser);
+ // The headers length is to be taken from the 'length' value
+ SENF_PARSER_GOTO_OFFSET( length(), headerEnd__init_bytes );
+
+ SENF_PARSER_FINALIZE( RadiotapPacketParser );
+
+ SENF_PARSER_SKIP_BITS( 4 );
+ SENF_PARSER_BITFIELD_RO ( frameType, 2, unsigned );
+ SENF_PARSER_SKIP_BITS( 2 );
+
};
/** \brief Radiotap packet
\par Fields:
\ref RadiotapPacketParser
-
+ \image html RadiotapPacket.png
+
+ \see http://www.radiotap.org/
+
\ingroup protocolbundle_80211
*/
struct RadiotapPacketType
- : public senf::PacketTypeBase,
- public senf::PacketTypeMixin<RadiotapPacketType>
+ : public PacketTypeBase,
+ public PacketTypeMixin<RadiotapPacketType>
{
- typedef senf::PacketTypeMixin<RadiotapPacketType> mixin;
- typedef senf::ConcretePacket<RadiotapPacketType> packet;
- typedef senf::RadiotapPacketParser parser;
+ typedef PacketTypeMixin<RadiotapPacketType> mixin;
+ typedef ConcretePacket<RadiotapPacketType> packet;
+ typedef RadiotapPacketParser parser;
- using mixin::nextPacketRange;
using mixin::init;
using mixin::initSize;
static void dump(packet p, std::ostream &os);
static void finalize(packet p);
static factory_t nextPacketType(packet p);
-
+ static optional_range nextPacketRange(packet p);
};
- typedef senf::ConcretePacket<RadiotapPacketType> RadiotapPacket;
+ typedef ConcretePacket<RadiotapPacketType> RadiotapPacket;
}
#endif
+
+\f
+// Local Variables:
+// mode: c++
+// fill-column: 100
+// comment-column: 40
+// c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// End:
projects / senf.git / blobdiff