X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=b4ba16eed488223779e95a5dcbce391e47c5340a;hb=3a0e403d889f8a16d78d50bbcd7a0f0157b05313;hp=82adea3bc8d8d17e2cef803cba26d57b2f7079c5;hpb=cf48e83de9d4793ca5bd67d1e5acdb5b20968638;p=senf.git

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index 82adea3..b4ba16e 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -36,7 +36,10 @@
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
 {
-    return senf::bytes(self()) + this->length();
+    if (Base::Registry::instance().isRegistered( *this))
+        return Base::Registry::instance().bytes( *this);
+    else
+        return senf::bytes(self()) + this->length();
 }
 
 template <class Base>
@@ -113,11 +116,51 @@ prefix_ void senf::GenericTLVParserBase<Base>::value(
 
 template <class BaseParser, class Parser>
 prefix_ void senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::dump(
-        std::ostream & os, GenericTLVParserBase<BaseParser> const & parser)
+        GenericTLVParserBase<BaseParser> const & parser, std::ostream & os)
+    const
 {
     (parser.template as<Parser>()).dump(os);
 }
 
+template <class BaseParser, class Parser>
+prefix_ senf::PacketParserBase::size_type
+senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::bytes(
+        GenericTLVParserBase<BaseParser> const & parser)
+    const
+{
+    return senf::bytes( parser.template as<Parser>());
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry<BaseParser,Keytype>
+
+template <class BaseParser, class Keytype>
+prefix_ bool senf::GenericTLVParserRegistry<BaseParser,Keytype>::isRegistered(
+        GenericTLVParser const & parser)
+    const
+{
+    typename Map::const_iterator i (map_.find( parser.type()));
+    return i != map_.end();
+}
+
+template <class BaseParser, class Keytype>
+prefix_ bool senf::GenericTLVParserRegistry<BaseParser,Keytype>::isRegistered(Keytype const & key)
+    const
+{
+    typename Map::const_iterator i (map_.find( key));
+    return i != map_.end();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<PacketParser>
+
+template <class BaseParser, class Keytype>
+template <class PacketParser>
+prefix_ senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<PacketParser>::RegistrationProxy()
+{
+    GenericTLVParserRegistry<BaseParser,Keytype>::instance().registerParser<PacketParser>();
+};
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_