X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.hh;h=1d1c22604fcfcb801affcd4de58342e040388530;hb=29a39b247b75454ad25f3f9dc7a524debf8e805c;hp=e5083c546cb377170a8c084c2b0a88683915fb04;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.hh b/senf/Packets/80221Bundle/MIHPacket.hh index e5083c5..1d1c226 100644 --- a/senf/Packets/80221Bundle/MIHPacket.hh +++ b/senf/Packets/80221Bundle/MIHPacket.hh @@ -60,12 +60,12 @@ namespace senf { public: enum Type { Empty, MACAddress, INet4Address, INet6Address, String, EUI64 }; - MIHFId(); - MIHFId(senf::MACAddress const & addr); - MIHFId(senf::INet4Address const & addr); - MIHFId(senf::INet6Address const & addr); - MIHFId(std::string const & addr); - MIHFId(senf::EUI64 const & addr); + MIHFId(); ///< Create empty instance. + MIHFId(senf::MACAddress const & addr); ///< Construct id with given MACAddress + MIHFId(senf::INet4Address const & addr); ///< Construct id with given INet4Address + MIHFId(senf::INet6Address const & addr); ///< Construct id with given INet6Address + MIHFId(std::string const & addr); ///< Construct id with given String + MIHFId(senf::EUI64 const & addr); ///< Construct id with given EUI64 Type type() const; bool operator==(MIHFId const & other) const; @@ -112,13 +112,14 @@ namespace senf { \note you must call mihfIdPacket.maxLengthValue( 253) *before* setting longer MIHF_IDs values. */ - class MIHFId_TLVParser : public BaseTLVPacketParser + class MIHFId_TLVParser : public MIHBaseTLVParser { # include SENF_PARSER() - SENF_PARSER_INHERIT ( BaseTLVPacketParser ); - SENF_PARSER_SKIP ( length(), 0 ); - SENF_PARSER_FINALIZE ( MIHFId_TLVParser ); - + SENF_PARSER_INHERIT ( MIHBaseTLVParser ); + SENF_PARSER_SKIP ( length(), 0 ); + SENF_PARSER_FINALIZE ( MIHFId_TLVParser ); + + public: std::string asString() const; void setString(std::string const &id); @@ -250,8 +251,7 @@ namespace senf { struct MIHPayloadPacketParser : public PacketParserBase { # include SENF_PARSER() - SENF_PARSER_LIST ( tlv_list, packetSize(), GenericTLVPacketParser ); - + SENF_PARSER_LIST ( tlv_list, packetSize(), MIHGenericTLVPacketParser ); SENF_PARSER_FINALIZE ( MIHPayloadPacketParser ); };