X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.hh;h=f04adff226e45cc2a0fc16a9e404f9d4f55a6620;hb=33adfa86c0b25cb6eeda0fa12d47e077e488375a;hp=c8b49ada7f6ac702edf9509a65bc9a762a4c421e;hpb=52ceda9d4019d45ef0d1a941d517b4ffeafe547b;p=senf.git diff --git a/senf/Packets/80221Bundle/TLVParser.hh b/senf/Packets/80221Bundle/TLVParser.hh index c8b49ad..f04adff 100644 --- a/senf/Packets/80221Bundle/TLVParser.hh +++ b/senf/Packets/80221Bundle/TLVParser.hh @@ -97,9 +97,9 @@ namespace senf { \endcode You have to adjust the maximum length value with the \ref maxLengthValue function - before the length value is set. The default maximum value is 127. So, in the above + before the length value is set. The default maximum value is 128. So, in the above example adding more than 21 MACAddresses to the vector will throw a TLVLengthException - if you don't call \c macAddressesTLVPacket->maxLengthValue( \e some_value) before. + if you don't call \c maxLengthValue( \e some_value) before. \see MIHTLVLengthParser \n MIHGenericTLVParser \n @@ -126,17 +126,14 @@ namespace senf { The size of the length field will be decreased to minimum necessary to hold the current length value. */ - void finalizeLength() { + void finalize() { protect(), length_().finalize(); }; typedef GenericTLVParserRegistry Registry; - - protected: - /// resize the packet after the length field to given size - senf::safe_data_iterator resizeValueField(MIHTLVLengthParser::value_type size); }; + /** \brief Parser for a generic TLV packet */ @@ -156,69 +153,117 @@ namespace senf { /** \brief Parse a MIHF_ID - the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21) - we could set maxLengthValue in init(), but for the most MIHF_IDs the default - maximum length of 127 should be enough. + Note that the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21) + We could set maxLengthValue in init(), but for the most MIHF_IDs the default + maximum length of 128 should be enough. - \note you must call mihfIdPacket.maxLengthValue( 253) *before* - setting longer MIHF_IDs values. + \note you must call maxIdLength( 253) *before* setting MIHF_IDs values longer + than 128. + + \see MIHFId */ class MIHFIdTLVParser : public MIHBaseTLVParser { # include SENF_PARSER() SENF_PARSER_INHERIT ( MIHBaseTLVParser ); - SENF_PARSER_SKIP ( length(), 0 ); + SENF_PARSER_FIELD_RO ( idLength, MIHTLVLengthParser ); + SENF_PARSER_LABEL ( idValue ); + SENF_PARSER_SKIP ( idLength(), 0 ); SENF_PARSER_FINALIZE ( MIHFIdTLVParser ); public: - std::string asString() const; - void setString(std::string const &id); - - senf::MACAddress asMACAddress() const; - void setMACAddress(senf::MACAddress const &mac); - - senf::INet4Address asINet4Address() const; - void setINet4Address(senf::INet4Address const &addr); - - senf::INet6Address asINet6Address() const; - void setINet6Address(senf::INet6Address const &addr); + ///\name Value setters + ///@{ + void value( MIHFId const & id); - senf::EUI64 asEUI64() const; - void setEUI64(senf::EUI64 const &addr); + void value( std::string const & id ); + void value( senf::MACAddress const & addr); + void value( senf::INet4Address const & addr); + void value( senf::INet6Address const & addr); + void value( senf::EUI64 const & addr); + ///@} - MIHFId valueAs(MIHFId::Type type) const; + ///\name Value getters + ///@{ + MIHFId valueAs( MIHFId::Type type) const; + + std::string valueAsString() const; + senf::MACAddress valueAsMACAddress() const; + senf::INet4Address valueAsINet4Address() const; + senf::INet6Address valueAsINet6Address() const; + senf::EUI64 valueAsEUI64() const; + ///@} + + ///\name Value comparisons + ///@{ + bool valueEquals( MIHFId const & id) const; + + bool valueEquals( std::string const & id ) const; + bool valueEquals( senf::MACAddress const & addr) const; + bool valueEquals( senf::INet4Address const & addr) const; + bool valueEquals( senf::INet6Address const & addr) const; + bool valueEquals( senf::EUI64 const & addr) const; + ///@} void dump(std::ostream & os) const; + void maxIdLength(boost::uint8_t maxLength); + void finalize(); private: + /// resize the packet after the length field to given size + senf::safe_data_iterator resizeValueField(MIHTLVLengthParser::value_type size); + + data_iterator valueBegin() const; + data_iterator valueEnd() const; + template struct binaryNAIEncoder { - binaryNAIEncoder(OutputIterator &i) : i_(i) {} - void operator()(const boost::uint8_t &v) const { - *i_++ = '\\'; - *i_++ = v; - } - OutputIterator &i_; + binaryNAIEncoder(OutputIterator & i); + void operator()(boost::uint8_t v); + OutputIterator & i_; }; + template - static boost::function_output_iterator > getNAIEncodedOutputIterator(OutputIterator i) { - return boost::make_function_output_iterator(binaryNAIEncoder(i)); - } + static boost::function_output_iterator > + getNAIEncodedOutputIterator(OutputIterator i); struct binaryNAIDecoder { - binaryNAIDecoder() : readNextByte_(true) {} - bool operator()(const boost::uint8_t &v) { - readNextByte_ = readNextByte_ ? false : true; - return readNextByte_; - } + binaryNAIDecoder(); + bool operator()(boost::uint8_t v); bool readNextByte_; }; + template - static boost::filter_iterator getNAIDecodedIterator(Iterator begin, Iterator end) { - return boost::make_filter_iterator(begin, end); - } + static boost::filter_iterator + getNAIDecodedIterator(Iterator begin, Iterator end); + + struct ValueSetterVisitor : public boost::static_visitor<> { + MIHFIdTLVParser & parser; + ValueSetterVisitor( MIHFIdTLVParser & p) : parser(p) {} + void operator()( boost::blank ) const { + parser.value( std::string()); + } + template + void operator()( MIHFIdType const & id ) const { + parser.value( id); + } + }; + + struct ValueEqualsVisitor : public boost::static_visitor { + MIHFIdTLVParser const & parser; + ValueEqualsVisitor( MIHFIdTLVParser const & p) : parser(p) {} + bool operator()( boost::blank ) const { + return parser.length() == 0; + } + template + bool operator()( MIHFIdType const & id ) const { + return parser.valueEquals( id); + } + }; }; + /** \brief Parser for 802.21 source MIHF_ID TLV + */ struct MIHFSrcIdTLVParser : public MIHFIdTLVParser { MIHFSrcIdTLVParser(data_iterator i, state_type s) : MIHFIdTLVParser(i,s) {} @@ -228,10 +273,11 @@ namespace senf { type() << typeId+0; } static type_t::value_type const typeId = 1; - void dump(std::ostream & os) const; }; + /** \brief Parser for 802.21 destination MIHF_ID TLV + */ struct MIHFDstIdTLVParser : public MIHFIdTLVParser { MIHFDstIdTLVParser(data_iterator i, state_type s) : MIHFIdTLVParser(i,s) {} @@ -241,7 +287,6 @@ namespace senf { type() << typeId+0; } static type_t::value_type const typeId = 2; - void dump(std::ostream & os) const; }; @@ -253,6 +298,7 @@ namespace senf { SENF_PARSER_INHERIT ( MIHBaseTLVParser ); SENF_PARSER_FIELD ( value, UInt8Parser ); SENF_PARSER_FINALIZE( MIHStatusTLVParser ); + SENF_PARSER_INIT() { defaultInit(); type() << typeId+0; @@ -305,7 +351,7 @@ namespace senf { ///////////////////////////////hh.e//////////////////////////////////////// #include "TLVParser.cci" //#include "TLVParser.ct" -//#include "TLVParser.cti" +#include "TLVParser.cti" #endif