X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=fb5c6bb55473bf1ef15ecf2db214aa41ecfaecf5;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=de01ab2ae12053318d58d96d449b531453c7de59;hpb=29a39b247b75454ad25f3f9dc7a524debf8e805c;p=senf.git
diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index de01ab2..fb5c6bb 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -30,10 +30,17 @@
#define prefix_ inline
///////////////////////////////cti.p///////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserBase
+
template
prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase::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
@@ -46,6 +53,7 @@ prefix_ void senf::GenericTLVParserBase::init()
template
template
prefix_ Parser senf::GenericTLVParserBase::as()
+ const
{
return Parser(this->i(), this->state() );
}
@@ -53,8 +61,9 @@ prefix_ Parser senf::GenericTLVParserBase::as()
template
template
prefix_ bool senf::GenericTLVParserBase::is()
+ const
{
- return this->type().value() == Parser::TYPEID;
+ return this->type().value() == Parser::typeId;
}
template
@@ -77,8 +86,8 @@ template
prefix_ void senf::GenericTLVParserBase::value(
ForwardReadableRange const & val,
typename boost::disable_if >::type *)
-{
- value_( val);
+{
+ value_( val);
}
template
@@ -86,8 +95,8 @@ template
prefix_ void senf::GenericTLVParserBase::value(
std::pair const & val,
typename boost::disable_if >::type *)
-{
- value_( val);
+{
+ value_( val);
}
template
@@ -95,13 +104,64 @@ template
prefix_ void senf::GenericTLVParserBase::value(
std::pair const & val,
typename boost::enable_if >::type *)
-{
+{
this->type() = val.first;
- value_( val.second);
+ value_( val.second);
}
#endif
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail:GenericTLVParserRegistry_Entry
+
+template
+prefix_ void senf::detail::GenericTLVParserRegistry_Entry::dump(
+ GenericTLVParserBase const & parser, std::ostream & os)
+ const
+{
+ (parser.template as()).dump(os);
+}
+
+template
+prefix_ senf::PacketParserBase::size_type
+senf::detail::GenericTLVParserRegistry_Entry::bytes(
+ GenericTLVParserBase const & parser)
+ const
+{
+ return senf::bytes( parser.template as());
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry
+
+template
+prefix_ bool senf::GenericTLVParserRegistry::isRegistered(
+ GenericTLVParser const & parser)
+ const
+{
+ typename Map::const_iterator i (map_.find( parser.type()));
+ return i != map_.end();
+}
+
+template
+prefix_ bool senf::GenericTLVParserRegistry::isRegistered(Keytype const & key)
+ const
+{
+ typename Map::const_iterator i (map_.find( key));
+ return i != map_.end();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry::RegistrationProxy
+
+template
+template
+prefix_ senf::GenericTLVParserRegistry::RegistrationProxy::RegistrationProxy()
+{
+ GenericTLVParserRegistry::instance().registerParser();
+};
+
///////////////////////////////cti.e///////////////////////////////////////
#undef prefix_