X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.hh;h=1efe4b63d20c56501db1cce11a54901cafb74c5f;hb=34700cdc907e04dbe026df9e86d0509990706a31;hp=e051bfb5cc0118d765bea5f894bea2c0ed5f4c60;hpb=482523171f06cf239fd7e8c991f81711c02cf0ba;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.hh b/senf/Packets/80221Bundle/MIHPacket.hh index e051bfb..1efe4b6 100644 --- a/senf/Packets/80221Bundle/MIHPacket.hh +++ b/senf/Packets/80221Bundle/MIHPacket.hh @@ -29,22 +29,13 @@ // Custom includes #include #include "TLVParser.hh" +#include "MIHMessageRegistry.hh" //#include "MIHPacket.mpp" ///////////////////////////////hh.p//////////////////////////////////////// namespace senf { - struct MIHMessageRegistry { - // MIH messages registry - typedef boost::uint16_t key_t; - }; - -# define SENF_MIH_PACKET_REGISTRY_REGISTER( packet ) \ - SENF_PACKET_REGISTRY_REGISTER( \ - senf::MIHMessageRegistry, packet::type::MESSAGE_ID, packet ) - - /** \brief Parse a MIH packet Parser implementing the MIH header. The fields implemented are: @@ -70,13 +61,13 @@ namespace senf { 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 ); SENF_PARSER_FIELD_RO ( payloadLength, UInt16Parser ); - + SENF_PARSER_GOTO_OFFSET( 8, 8); // just to limit the offset calculation - + // Source MIHF Id SENF_PARSER_FIELD ( src_mihfId, MIHFSrcIdTLVParser ); // Destination MIHF Id