X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2F80221Bundle%2FMIHPacket.hh;h=a67f0a6b4837c02191d2dd49a5e6f6cc7576500c;hb=eb89ea10c8c11d2ef12239cb037c958dec50f006;hp=a7dcc78c531e5e3debadfa64e263af760fcf5a55;hpb=9c3803e6f6a6073a43524940307b7dd7de8b16d9;p=senf.git diff --git a/Packets/80221Bundle/MIHPacket.hh b/Packets/80221Bundle/MIHPacket.hh index a7dcc78..a67f0a6 100644 --- a/Packets/80221Bundle/MIHPacket.hh +++ b/Packets/80221Bundle/MIHPacket.hh @@ -35,14 +35,14 @@ namespace senf { - struct MIHF_IdParser : public senf::PacketParserBase + struct MIHF_IdParser : public PacketParserBase { - # include SENF_FIXED_PARSER() - + # include SENF_PARSER() + SENF_PARSER_FINALIZE ( MIHF_IdParser ); }; - struct MIHPacketParser : public senf::PacketParserBase + struct MIHPacketParser : public PacketParserBase { # include SENF_PARSER() @@ -55,9 +55,9 @@ namespace senf { SENF_PARSER_SKIP_BITS ( 1 ); // MIH message ID (MID) - SENF_PARSER_BITFIELD ( sid, 4, unsigned ); - SENF_PARSER_BITFIELD ( opcode, 2, unsigned ); - SENF_PARSER_BITFIELD ( aid, 10, unsigned ); + SENF_PARSER_BITFIELD ( sid, 4, unsigned ); + SENF_PARSER_BITFIELD ( opcode, 2, unsigned ); + SENF_PARSER_BITFIELD ( aid, 10, unsigned ); SENF_PARSER_SKIP_BITS ( 4 ); SENF_PARSER_BITFIELD ( transactionId, 12, unsigned ); @@ -78,11 +78,22 @@ namespace senf { SENF_PARSER_INIT() { version_() = 1; source_type() = 1; - destination_type() = 1; + destination_type() = 2; } + + friend class MIHPacketType; }; - + /** \brief MIH packet + + \par Packet type (typedef): + \ref MIHPacket + + \par Fields: + \ref MIHPacketParser + + \ingroup protocolbundle_80221 + */ struct MIHPacketType : public PacketTypeBase, public PacketTypeMixin @@ -96,7 +107,7 @@ namespace senf { using mixin::initSize; static void dump(packet p, std::ostream &os); -// static void finalize(packet p); + static void finalize(packet p); }; typedef ConcretePacket MIHPacket;