X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=fb5c6bb55473bf1ef15ecf2db214aa41ecfaecf5;hb=9bc655e14d2d8c204ed835896cb51e42d49bd68f;hp=5c755652c8ed974bc2621495198b33429bb6e295;hpb=52ceda9d4019d45ef0d1a941d517b4ffeafe547b;p=senf.git

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index 5c75565..fb5c6bb 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -35,8 +35,12 @@
 
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
+    const
 {
-    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>
@@ -75,13 +79,6 @@ prefix_ Base const & senf::GenericTLVParserBase<Base>::self()
     return *static_cast<Base const *>(this);
 }
 
-template <class Base>
-prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
-    const 
-{
-    GenericTLVParserRegistry<Base>::instance().dump(*this, os);
-}
-
 #ifndef DOXYGEN
 
 template <class Base>
@@ -89,8 +86,8 @@ template <class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         ForwardReadableRange const & val,
         typename boost::disable_if<senf::is_pair<ForwardReadableRange> >::type *)
-{ 
-    value_( val); 
+{
+    value_( val);
 }
 
 template <class Base>
@@ -98,8 +95,8 @@ template <class First, class Second>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         std::pair<First, Second> const & val,
         typename boost::disable_if<boost::is_convertible<First, typename Base::type_t::value_type> >::type *)
-{ 
-    value_( val); 
+{
+    value_( val);
 }
 
 template <class Base>
@@ -107,9 +104,9 @@ template <class Type, class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         std::pair<Type, ForwardReadableRange> const & val,
         typename boost::enable_if<boost::is_convertible<Type, typename Base::type_t::value_type> >::type *)
-{ 
+{
     this->type() = val.first;
-    value_( val.second); 
+    value_( val.second);
 }
 
 #endif
@@ -126,15 +123,43 @@ prefix_ void senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::d
     (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>::RegistrationProxy<PacketParser>
+// senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<PacketParser>
 
-template <class BaseParser>
+template <class BaseParser, class Keytype>
 template <class PacketParser>
-prefix_ senf::GenericTLVParserRegistry<BaseParser>::RegistrationProxy<PacketParser>::RegistrationProxy()
+prefix_ senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<PacketParser>::RegistrationProxy()
 {
-    GenericTLVParserRegistry<BaseParser>::instance().registerParser<PacketParser>();
+    GenericTLVParserRegistry<BaseParser,Keytype>::instance().registerParser<PacketParser>();
 };
 
 ///////////////////////////////cti.e///////////////////////////////////////