X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=fb5c6bb55473bf1ef15ecf2db214aa41ecfaecf5;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=a5d39b5dda1b1a95ae90bbfe162a07b399bf6f86;hpb=f723d7852a8195072eee387ea9ca77156b58438b;p=senf.git

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index a5d39b5..fb5c6bb 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -30,10 +30,17 @@
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserBase<Base>
+
 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>
@@ -56,7 +63,7 @@ template <class Parser>
 prefix_ bool senf::GenericTLVParserBase<Base>::is()
     const
 {
-    return this->type().value() == Parser::TYPEID;
+    return this->type().value() == Parser::typeId;
 }
 
 template <class Base>
@@ -79,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>
@@ -88,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>
@@ -97,13 +104,64 @@ 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
 
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail:GenericTLVParserRegistry_Entry<BaseParser, Parser>
+
+template <class BaseParser, class Parser>
+prefix_ void senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::dump(
+        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_