X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=55005161e9e1bd0511fdc4191d953fb195904373;hb=482523171f06cf239fd7e8c991f81711c02cf0ba;hp=f66eec3f4fa4f4d30c41693763ba4b04139469c4;hpb=a79c5e98760ea8232c13d8266eb7ca0ac5cdefd3;p=senf.git

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index f66eec3..5500516 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -30,10 +30,13 @@
 #define prefix_ inline
 ///////////////////////////////cti.p///////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserBase<Base>
+
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::bytes()
 {
-    return senf::init_bytes<Base>::value + this->length();
+    return senf::bytes(self()) + this->length();
 }
 
 template <class Base>
@@ -46,6 +49,7 @@ prefix_ void senf::GenericTLVParserBase<Base>::init()
 template <class Base>
 template <class Parser>
 prefix_ Parser senf::GenericTLVParserBase<Base>::as()
+    const
 {
     return Parser(this->i(), this->state() );
 }
@@ -53,11 +57,34 @@ prefix_ Parser senf::GenericTLVParserBase<Base>::as()
 template <class Base>
 template <class Parser>
 prefix_ bool senf::GenericTLVParserBase<Base>::is()
+    const
+{
+    return this->type().value() == Parser::typeId;
+}
+
+template <class Base>
+prefix_ Base & senf::GenericTLVParserBase<Base>::self()
 {
-    return this->type().value() == Parser::TYPEID;
+    return *static_cast<Base *>(this);
 }
 
 template <class Base>
+prefix_ Base const & senf::GenericTLVParserBase<Base>::self()
+    const
+{
+    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>
 template <class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         ForwardReadableRange const & val,
@@ -85,6 +112,30 @@ prefix_ void senf::GenericTLVParserBase<Base>::value(
     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)
+{
+    (parser.template as<Parser>()).dump(os);
+}
+
+
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry<BaseParser>::RegistrationProxy<PacketParser>
+
+template <class BaseParser>
+template <class PacketParser>
+prefix_ senf::GenericTLVParserRegistry<BaseParser>::RegistrationProxy<PacketParser>::RegistrationProxy()
+{
+    GenericTLVParserRegistry<BaseParser>::instance().registerParser<PacketParser>();
+};
+
 ///////////////////////////////cti.e///////////////////////////////////////
 #undef prefix_