X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHTypes.hh;h=d32a00f2c2f7df5fa3213c2dc63965148b9f439b;hb=57daeae6f2e924ce3f16f9677c3474f531cba9e5;hp=64ae62b62126994af0fb9dcc349534cc4717bf57;hpb=9762e8c5d2f6c1264ba97acd3e589f6fa8f522c6;p=senf.git diff --git a/senf/Packets/80221Bundle/MIHTypes.hh b/senf/Packets/80221Bundle/MIHTypes.hh index 64ae62b..d32a00f 100644 --- a/senf/Packets/80221Bundle/MIHTypes.hh +++ b/senf/Packets/80221Bundle/MIHTypes.hh @@ -35,35 +35,34 @@ #include //#include "MIHTypes.mpp" -///////////////////////////////hh.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// namespace senf { - class MIHFId - : public boost::variant< boost::blank, senf::MACAddress, senf::INet4Address, + class MIHFId + : public boost::variant< boost::blank, senf::MACAddress, senf::INet4Address, senf::INet6Address, std::string, senf::EUI64 >, public boost::less_than_comparable, public boost::equality_comparable { public: static MIHFId const Multicast; ///< The multicast (empty) MIHF Id - static MIHFId const None; ///< The multicast (empty) MIHF Id - enum Type { Empty, MACAddress, INet4Address, INet6Address, String, EUI64 }; - - MIHFId(); ///< Create empty instance. - MIHFId(senf::MACAddress const & addr); ///< Construct id with given MACAddress + enum Type { MulticastType, MACAddress, INet4Address, INet6Address, String, EUI64 }; + + MIHFId(); ///< Create multicast id. + 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; - bool operator<(MIHFId const & other) const; - + bool operator<(MIHFId const & other) const; + private: struct GetTypeVisitor : public boost::static_visitor { - Type operator()(boost::blank const &) const { return Empty; } + Type operator()(boost::blank const &) const { return MulticastType; } Type operator()(senf::MACAddress const &) const { return MACAddress; } Type operator()(senf::INet4Address const &) const { return INet4Address; } Type operator()(senf::INet6Address const &) const { return INet6Address; } @@ -94,7 +93,7 @@ namespace senf { } -///////////////////////////////hh.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #include "MIHTypes.cci" //#include "MIHTypes.ct" //#include "MIHTypes.cti"