X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2F80211Bundle%2FRadiotapPacket.hh;h=ebea56717b765a028127f955395526bdc58721d4;hb=d498c7507e2eaa191e859ae525df97dc257e0d7a;hp=e36308ee0bc48c617546be9eed780911328cf8e2;hpb=74d16ea37608b6f80f0b79be66adee0fa9a5b0a6;p=senf.git
diff --git a/Packets/80211Bundle/RadiotapPacket.hh b/Packets/80211Bundle/RadiotapPacket.hh
index e36308e..ebea567 100644
--- a/Packets/80211Bundle/RadiotapPacket.hh
+++ b/Packets/80211Bundle/RadiotapPacket.hh
@@ -35,7 +35,7 @@ namespace senf
Re-ordering of bits due to LSB byte order
*/
- struct RadiotapPacketParser_Flags : public senf::PacketParserBase
+ struct RadiotapPacketParser_Flags : public PacketParserBase
{
# include SENF_FIXED_PARSER()
@@ -55,7 +55,7 @@ namespace senf
Re-ordering of bits due to LSB byte order
*/
- struct RadiotapPacketParser_ChannelOptions : public senf::PacketParserBase
+ struct RadiotapPacketParser_ChannelOptions : public PacketParserBase
{
# include SENF_FIXED_PARSER()
@@ -95,7 +95,7 @@ namespace senf
\todo extended present field (bit 31 of present field is set)
*/
- struct RadiotapPacketParser : public senf::PacketParserBase
+ struct RadiotapPacketParser : public PacketParserBase
{
# include SENF_PARSER()
@@ -143,7 +143,7 @@ namespace senf
#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) \
@@ -152,10 +152,10 @@ namespace senf
senf::bytes(parser##_())) % size) % size : 0) , 0 );
OPTIONAL_FIELD ( tsft, UInt64LSBParser );
- OPTIONAL_FIELD ( flags, RadiotapPacketParser_Flags );
+ OPTIONAL_FIELD ( flags, RadiotapPacketParser_Flags ); //
+ : public PacketTypeBase,
+ public PacketTypeMixin
{
- typedef senf::PacketTypeMixin mixin;
- typedef senf::ConcretePacket packet;
- typedef senf::RadiotapPacketParser parser;
+ typedef PacketTypeMixin mixin;
+ typedef ConcretePacket packet;
+ typedef RadiotapPacketParser parser;
using mixin::nextPacketRange;
using mixin::init;
@@ -209,7 +210,7 @@ namespace senf
static factory_t nextPacketType(packet p);
};
- typedef senf::ConcretePacket RadiotapPacket;
+ typedef ConcretePacket RadiotapPacket;
}
#endif