X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.ct;h=fb59a100049c13e91d17ccbd55887e8133fa0797;hb=6dfb1a69bf12258f6f8117f5e4c257c4e0367a29;hp=f1f34f773061e1da3c6ebb502bbbcb421cc5981b;hpb=52ceda9d4019d45ef0d1a941d517b4ffeafe547b;p=senf.git
diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index f1f34f7..fb59a10 100644
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -52,6 +52,22 @@ prefix_ Parser senf::GenericTLVParserBase::init()
}
template
+prefix_ void senf::GenericTLVParserBase::dump(std::ostream & os)
+ const
+{
+ 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
prefix_ senf::PacketInterpreterBase::range senf::GenericTLVParserBase::value()
const
{
@@ -74,33 +90,35 @@ prefix_ void senf::GenericTLVParserBase::value_(ForwardReadableRange const
///////////////////////////////////////////////////////////////////////////
-// senf::GenericTLVParserRegistry
+// senf::GenericTLVParserRegistry
-template
+template
template
-prefix_ void senf::GenericTLVParserRegistry::registerParser()
+prefix_ void senf::GenericTLVParserRegistry::registerParser()
{
- typename BaseParser::type_t::value_type key (Parser::typeId+0);
+ Keytype key (Parser::typeId+0);
typename Map::iterator i (map_.find( key ));
if (i == map_.end() )
map_.insert(key, new detail::GenericTLVParserRegistry_Entry() );
}
-template
-prefix_ void senf::GenericTLVParserRegistry::dump(
+template
+prefix_ void senf::GenericTLVParserRegistry::dump(
GenericTLVParserBase const & parser, std::ostream & os)
const
{
- typename Map::iterator i (map_.find( parser.type()));
- if (i == map_.end()) {
- boost::io::ios_all_saver ias(os);
- os << " GenericTLVParser<" << prettyName(typeid(BaseParser)) << ">\n"
- << " type: " << senf::format::dumpint(parser.type()) << "\n"
- << " length: " << senf::format::dumpint(parser.length()) << "\n"
- << " value:\n";
- hexdump(parser.value().begin(), parser.value().end(), os);
- }
- else
+ typename Map::const_iterator i (map_.find( parser.type()));
+ if (i != map_.end())
+ (i->second)->dump(parser, os);
+}
+
+template
+prefix_ void senf::GenericTLVParserRegistry::dump(
+ GenericTLVParserBase const & parser, Keytype const & key, std::ostream & os)
+ const
+{
+ typename Map::const_iterator i (map_.find( key));
+ if (i != map_.end())
(i->second)->dump(parser, os);
}