Add 'comment' argument to SENF_ASSERT

[senf.git] / senf / Packets / GenericTLV.ct

diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index fb59a10..e405ce7 100644 (file)
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -40,7 +40,7 @@
 template <class Base>
 template <class Parser>
 prefix_ Parser senf::GenericTLVParserBase<Base>::init()
-{  
+{
     senf::PacketParserBase::size_type oldSize (bytes() );
     senf::PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
     this->resize(  oldSize, newParserSize);
@@ -53,7 +53,7 @@ prefix_ Parser senf::GenericTLVParserBase<Base>::init()
 
 template <class Base>
 prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
-    const 
+    const
 {
     if (Base::Registry::instance().isRegistered( *this)) {
         Base::Registry::instance().dump( *this, os);
@@ -68,8 +68,8 @@ prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
 }
 
 template <class Base>
-prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value() 
-    const 
+prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+    const
 {
     senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
     return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
@@ -104,7 +104,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::registerParser(
 
 template <class BaseParser, class Keytype>
 prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
-        GenericTLVParserBase<BaseParser> const & parser, std::ostream & os)
+        GenericTLVParser const & parser, std::ostream & os)
     const
 {
     typename Map::const_iterator i (map_.find( parser.type()));
@@ -114,7 +114,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
 
 template <class BaseParser, class Keytype>
 prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
-        GenericTLVParserBase<BaseParser> const & parser, Keytype const & key, std::ostream & os)
+        GenericTLVParser const & parser, Keytype const & key, std::ostream & os)
     const
 {
     typename Map::const_iterator i (map_.find( key));
@@ -122,6 +122,32 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
         (i->second)->dump(parser, os);
 }
 
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+        GenericTLVParser const & parser)
+    const
+{
+    typename Map::const_iterator i (map_.find( parser.type()));
+    if (i != map_.end())
+        return (i->second)->bytes(parser);
+    else
+        throw TLVParserNotRegisteredException();
+}
+
+template <class BaseParser, class Keytype>
+prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BaseParser,Keytype>::bytes(
+        GenericTLVParser const & parser, Keytype const & key)
+    const
+{
+    typename Map::const_iterator i (map_.find( key));
+    if (i != map_.end())
+        return (i->second)->bytes(parser);
+    else
+        throw TLVParserNotRegisteredException();
+}
+
+
+
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_