template <class Base>
template <class Parser>
prefix_ Parser senf::GenericTLVParserBase<Base>::init()
-{
+{
senf::PacketParserBase::size_type oldSize (bytes() );
senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
this->resize( oldSize, newParserSize);
}
template <class Base>
-prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
- const
+prefix_ void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
+ const
{
- senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
- return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
+ if (Base::Registry::instance().isRegistered( *this)) {
+ Base::Registry::instance().dump( *this, os);
+ } else {
+ boost::io::ios_all_saver ias(os);
+ os << " GenericTLVParser<" << prettyName(typeid(Base)) << ">\n"
+ << " type: " << senf::format::dumpint(this->type()) << "\n"
+ << " length: " << senf::format::dumpint(this->length()) << "\n"
+ << " value:\n";
+ hexdump(value().begin(), value().end(), os);
+ }
}
template <class Base>
-prefix_ void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
- const
+prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+ const
{
- boost::io::ios_all_saver ias(os);
- os << "GenericTLVParser<" << prettyName(typeid(Base)) << ">\n"
- << " type: " << senf::format::dumpint(this->type()) << "\n"
- << " length: " << senf::format::dumpint(this->length()) << "\n"
- << " value:\n";
- hexdump(value().begin(), value().end(), os);
+ senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
+ return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
}
template <class Base>
///////////////////////////////////////////////////////////////////////////
-// senf::GenericTLVParserRegistry<BaseParser>
+// senf::GenericTLVParserRegistry<BaseParser,Keytype>
-template <class BaseParser>
+template <class BaseParser, class Keytype>
template <typename Parser>
-prefix_ void senf::GenericTLVParserRegistry<BaseParser>::registerParser()
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::registerParser()
{
- typename Map::iterator i (map_.find( Parser::typeId ));
- if (i == map_.end() ) {
- typename BaseParser::type_t::value_type k (Parser::typeId);
- map_.insert(k , new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
- }
+ Keytype key (Parser::typeId+0);
+ typename Map::iterator i (map_.find( key ));
+ if (i == map_.end() )
+ map_.insert(key, new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
+}
+
+// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ...
+
+#if BOOST_VERSION < 103400
+#define PTRMAP_GET_CONTENTS(v) (v)
+#else
+#define PTRMAP_GET_CONTENTS(v) (*(v).second)
+#endif
+
+template <class BaseParser, class Keytype>
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
+ GenericTLVParser const & parser, std::ostream & os)
+ const
+{
+ typename Map::const_iterator i (map_.find( parser.type()));
+ if (i != map_.end())
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
+}
+
+template <class BaseParser, class Keytype>
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
+ GenericTLVParser const & parser, Keytype const & key, std::ostream & os)
+ const
+{
+ typename Map::const_iterator i (map_.find( key));
+ if (i != map_.end())
+ PTRMAP_GET_CONTENTS(*i).dump(parser, os);
}
-template <class BaseParser>
-prefix_ void senf::GenericTLVParserRegistry<BaseParser>::dump(
- std::ostream & os, GenericTLVParserBase<BaseParser> const & parser)
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+ GenericTLVParser const & parser)
+ const
{
- typename Map::iterator i (map_.find( parser.type()));
- if (i == map_.end())
- parser.dump(os);
+ typename Map::const_iterator i (map_.find( parser.type()));
+ if (i != map_.end())
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
else
- (i->second)->dump(os, parser);
+ throw TLVParserNotRegisteredException();
}
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+ GenericTLVParser const & parser, Keytype const & key)
+ const
+{
+ typename Map::const_iterator i (map_.find( key));
+ if (i != map_.end())
+ return PTRMAP_GET_CONTENTS(*i).bytes(parser);
+ else
+ throw TLVParserNotRegisteredException();
+}
+
+#undef PTRMAP_GET_CONTENTS
+
///////////////////////////////ct.e////////////////////////////////////////
#undef prefix_