X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FTLVParser.hh;h=5faf9ebadc4e8b5e947faec1c8b1803ace0c3262;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=2df7440f4304ffb54ea7d6ddfccb903b1f0fc09a;hpb=0973cf085ba0ebc276342ac20643af2e8084e056;p=senf.git diff --git a/senf/Packets/80221Bundle/TLVParser.hh b/senf/Packets/80221Bundle/TLVParser.hh index 2df7440..5faf9eb 100644 --- a/senf/Packets/80221Bundle/TLVParser.hh +++ b/senf/Packets/80221Bundle/TLVParser.hh @@ -37,13 +37,13 @@ namespace senf { struct MIHTLVLengthException : public senf::Exception - { - MIHTLVLengthException() - : senf::Exception("MIHTLVLengthException") {} + { + MIHTLVLengthException() + : senf::Exception("MIHTLVLengthException") {} }; - - class MIHTLVLengthParser + + class MIHTLVLengthParser : public detail::packet::IntParserOps, public PacketParserBase { @@ -57,7 +57,7 @@ namespace senf { value_type value() const; void value(value_type const & v); - + MIHTLVLengthParser const & operator= (value_type other); size_type bytes() const; void init() const; @@ -70,37 +70,37 @@ namespace senf { SENF_PARSER_PRIVATE_BITFIELD ( fixed_length_field, 6, unsigned ); void finalize(); - void maxValue(value_type v); - value_type maxValue() const; - + void capacity(value_type v); + value_type capacity() const; + private: void resize_(size_type size); - }; - + }; + /** \brief Base class for MIH TLV parsers - + MIHBaseTLVParser is the abstract base class for MIH TLV parsers. It defines the - \ref type() field as an \ref senf::UInt8Parser and the \ref length() field as a - MIHTLVLengthParser. The length field is read-only. - - To create your own \c TLVParser you have to inherit from MIHBaseTLVParser (don't - forget \ref SENF_PARSER_INHERIT) and define the \c value field. In the following example - the value is a vector of MacAddresses: + \ref type() field as an \ref senf::UInt8Parser and the \ref length() field as a + MIHTLVLengthParser. The length field is read-only. + + To create your own \c TLVParser you have to inherit from MIHBaseTLVParser (don't + forget \ref SENF_PARSER_INHERIT) and define the \c value field. In the following example + the value is a vector of MacAddresses: \code struct MacAddressesTLVParser : public MIHBaseTLVParser { - # include SENF_PARSER() + # include SENF_PARSER() SENF_PARSER_INHERIT ( MIHBaseTLVParser ); SENF_PARSER_VECTOR ( value, bytes(length), senf::MACAddressParser ); SENF_PARSER_FINALIZE( MacAddressesTLVParser ); }; \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 + + You have to adjust the maximum length value with the \ref maxLength function + 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 maxLength( \e some_value) before. + \see MIHTLVLengthParser \n MIHGenericTLVParser \n */ @@ -111,33 +111,27 @@ namespace senf { SENF_PARSER_FIELD ( type, UInt8Parser ); SENF_PARSER_FIELD_RO ( length, MIHTLVLengthParser ); SENF_PARSER_FINALIZE ( MIHBaseTLVParser ); - - /** \brief set maximum value of length field - - The size of the length field will be increased if necessary. - \param v maximum value of length field - */ - void maxLengthValue(MIHTLVLengthParser::value_type v) const { - protect(), length_().maxValue(v); - } - - /** \brief shrink size of length field to minimum - + + /** \brief shrink size of the TLV length field to minimum + The size of the length field will be decreased to minimum necessary to hold the current length value. */ - void finalizeLength() { - protect(), length_().finalize(); - }; - + void 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 set maximum value of TLV length field + + The size of the length field will be increased if necessary. + \param v maximum value of length field + */ + void maxLength(MIHTLVLengthParser::value_type maxl) const; }; - + + /** \brief Parser for a generic TLV packet */ struct MIHGenericTLVParser @@ -148,74 +142,108 @@ namespace senf { void init() const { defaultInit(); - maxLengthValue( MIHTLVLengthParser::max_value); + maxLength( MIHTLVLengthParser::max_value); } - + using base::init; + using base::maxLength; + }; + + + /** \brief Base class for list TLV parser + */ + struct MIHBaseListTLVParser + : public MIHBaseTLVParser + { + # include SENF_PARSER() + SENF_PARSER_INHERIT ( MIHBaseTLVParser ); + SENF_PARSER_FIELD_RO ( listSize, MIHTLVLengthParser ); + SENF_PARSER_FINALIZE ( MIHBaseListTLVParser ); + + void maxListSize(MIHTLVLengthParser::value_type maxl) const; }; - + + template + struct MIHListTLVParserMixin + { + void finalize(); + }; + + /** \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 you must call mihfIdPacket.maxLengthValue( 253) *before* - setting longer MIHF_IDs values. + Note that the maximum length of a MIHF_ID is 253 octets (see F.3.11 in 802.21) + We could set maxLength in init(), but for the most MIHF_IDs the default + maximum length of 128 should be enough. + + \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: - ///\name value setters + ///\name Value setters ///@{ void value( MIHFId const & id); - + 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); + void value( senf::EUI64 const & addr); ///@} - ///\name value getters + ///\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 + + ///\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 maxl) const; + 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); void operator()(boost::uint8_t v); OutputIterator & i_; }; - + template - static boost::function_output_iterator > + static boost::function_output_iterator > getNAIEncodedOutputIterator(OutputIterator i); struct binaryNAIDecoder { @@ -223,11 +251,11 @@ namespace senf { bool operator()(boost::uint8_t v); bool readNextByte_; }; - + template - static boost::filter_iterator + static boost::filter_iterator getNAIDecodedIterator(Iterator begin, Iterator end); - + struct ValueSetterVisitor : public boost::static_visitor<> { MIHFIdTLVParser & parser; ValueSetterVisitor( MIHFIdTLVParser & p) : parser(p) {} @@ -239,12 +267,12 @@ namespace senf { 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; + return parser.idLength() == 0; } template bool operator()( MIHFIdType const & id ) const { @@ -253,10 +281,12 @@ namespace senf { }; }; + /** \brief Parser for 802.21 source MIHF_ID TLV + */ struct MIHFSrcIdTLVParser : public MIHFIdTLVParser { MIHFSrcIdTLVParser(data_iterator i, state_type s) : MIHFIdTLVParser(i,s) {} - + void init() const { defaultInit(); type() << typeId+0; @@ -264,11 +294,13 @@ namespace senf { 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) {} - + void init() const { defaultInit(); type() << typeId+0; @@ -276,7 +308,7 @@ namespace senf { static type_t::value_type const typeId = 2; void dump(std::ostream & os) const; }; - + /** \brief Parser for 802.21 Status TLV */ struct MIHStatusTLVParser : public MIHBaseTLVParser @@ -285,7 +317,7 @@ namespace senf { SENF_PARSER_INHERIT ( MIHBaseTLVParser ); SENF_PARSER_FIELD ( value, UInt8Parser ); SENF_PARSER_FINALIZE( MIHStatusTLVParser ); - + SENF_PARSER_INIT() { defaultInit(); type() << typeId+0; @@ -293,36 +325,36 @@ namespace senf { } static type_t::value_type const typeId = 3; void dump(std::ostream & os) const; ///< dump string representation to given stream - - enum StatusCode { + + enum StatusCode { Success, UnspecifiedFailure, Rejected, AuthorizationFailure, NetworkError }; }; - + struct MIHRegisterReqCodeTLVParser : public MIHBaseTLVParser { # include SENF_PARSER() SENF_PARSER_INHERIT ( MIHBaseTLVParser ); SENF_PARSER_FIELD ( value, UInt8Parser ); SENF_PARSER_FINALIZE ( MIHRegisterReqCodeTLVParser ); - + SENF_PARSER_INIT() { defaultInit(); type() = typeId+0; length_() = 1; } - static type_t::value_type const typeId = 11; + static type_t::value_type const typeId = 11; void dump(std::ostream & os) const; ///< dump string representation to given stream - + enum RequestCode { Registration, ReRegistration }; }; - + struct MIHValidTimeIntervalTLVParser : public MIHBaseTLVParser { # include SENF_PARSER() SENF_PARSER_INHERIT ( MIHBaseTLVParser ); SENF_PARSER_FIELD ( value, UInt32Parser ); SENF_PARSER_FINALIZE ( MIHValidTimeIntervalTLVParser ); - + SENF_PARSER_INIT() { defaultInit(); type() = typeId+0; @@ -337,7 +369,7 @@ namespace senf { ///////////////////////////////hh.e//////////////////////////////////////// #include "TLVParser.cci" -//#include "TLVParser.ct" +#include "TLVParser.ct" #include "TLVParser.cti" #endif