X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHPacket.hh;h=75ef61b90d3c592f7562db9e626a0228cac59382;hb=82e794070d4f3ae8aacb1827b21a93b9d48ce57f;hp=adff97e20826e44ee9977a933201943c7624e9e8;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHPacket.hh b/senf/Packets/80221Bundle/MIHPacket.hh index adff97e..75ef61b 100644 --- a/senf/Packets/80221Bundle/MIHPacket.hh +++ b/senf/Packets/80221Bundle/MIHPacket.hh @@ -27,14 +27,14 @@ #define HH_SENF_Packets_80221Bundle_MIHPacket_ 1 // Custom includes -#include "../../Packets/Packets.hh" -#include "../../Socket/Protocols/Raw/MACAddress.hh" -#include "../../Socket/Protocols/INet/INet4Address.hh" -#include "../../Socket/Protocols/INet/INet6Address.hh" +#include +#include +#include +#include #include "TLVPacket.hh" #include #include -#include "boost/variant.hpp" +#include //#include "MIHPacket.mpp" @@ -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; @@ -118,7 +118,8 @@ namespace senf { SENF_PARSER_INHERIT ( BaseTLVPacketParser ); SENF_PARSER_SKIP ( length(), 0 ); SENF_PARSER_FINALIZE ( MIHFId_TLVParser ); - + + public: std::string asString() const; void setString(std::string const &id); @@ -251,7 +252,6 @@ namespace senf { { # include SENF_PARSER() SENF_PARSER_LIST ( tlv_list, packetSize(), GenericTLVPacketParser ); - SENF_PARSER_FINALIZE ( MIHPayloadPacketParser ); };