X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.ct;h=2153937a970b946cfb69d315ac49f5359007ed2f;hb=961cf85a6abf2b5f0a7958bbfcd8f72e7b32721b;hp=6a905534521a2d7999fad0169c70918234f8bd15;hpb=a79c5e98760ea8232c13d8266eb7ca0ac5cdefd3;p=senf.git

diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index 6a90553..2153937 100644
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -26,14 +26,21 @@
 //#include "GenericTLV.ih"
 
 // Custom includes
+#include <boost/io/ios_state.hpp>
+#include <senf/Utils/hexdump.hh>
+#include <senf/Utils/TypeInfo.hh>
+#include <senf/Utils/Format.hh>
 
 #define prefix_
 ///////////////////////////////ct.p////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserBase<Base>
+
 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);
@@ -45,10 +52,26 @@ prefix_ Parser senf::GenericTLVParserBase<Base>::init()
 }
 
 template <class Base>
-prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value() 
-    const 
+prefix_  void senf::GenericTLVParserBase<Base>::dump(std::ostream & os)
+    const
+{
+    if (Base::Registry::instance().isRegistered( *this)) {
+        Base::Registry::instance().dump( *this, os);
+    } else {
+        boost::io::ios_all_saver ias(os);
+        os << "  GenericTLVParser<" << prettyName(typeid(Base)) << ">\n"
+           << "    type:   " << senf::format::dumpint(this->type()) << "\n"
+           << "    length: " << senf::format::dumpint(this->length()) << "\n"
+           << "    value:\n";
+        hexdump(value().begin(), value().end(), os);
+    }
+}
+
+template <class Base>
+prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+    const
 {
-    senf::PacketData::iterator begin (boost::next(this->i(), senf::init_bytes<Base>::value ));
+    senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
     return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
 }
 
@@ -56,15 +79,82 @@ template <class Base>
 template <class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value_(ForwardReadableRange const &range)
 {
-    unsigned int rangeSize = boost::size(range);
+    //typename boost::range_difference<ForwardReadableRange>::type rangeSize ( boost::size(range));
+    unsigned rangeSize ( boost::size(range));
     if ( rangeSize != this->length() )
-        resize( bytes(), rangeSize + senf::init_bytes<Base>::value );
+        resize( bytes(), rangeSize + senf::bytes(self()) );
     std::copy( boost::begin(range), boost::end(range), boost::next(
-            this->i(), senf::init_bytes<Base>::value));
+            this->i(), senf::bytes( self())) );
     this->length_() = rangeSize;
 }
 
 
+///////////////////////////////////////////////////////////////////////////
+// senf::GenericTLVParserRegistry<BaseParser,Keytype>
+
+template <class BaseParser, class Keytype>
+template <typename Parser>
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::registerParser()
+{
+    Keytype key (Parser::typeId+0);
+    typename Map::iterator i (map_.find( key ));
+    if (i == map_.end() )
+        map_.insert(key, new detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>() );
+}
+
+// Wow ... this is stupid .. Boost 1.33 ptr_map API is broken ...
+
+#if BOOST_VERSION < 103400
+#define PTRMAP_GET_CONTENTS(v) (v)
+#else
+#define PTRMAP_GET_CONTENTS(v) (*(v).second)
+#endif
+
+template <class BaseParser, class Keytype>
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
+        GenericTLVParser const & parser, std::ostream & os)
+    const
+{
+    typename Map::const_iterator i (map_.find( parser.type()));
+    if (i != map_.end())
+        PTRMAP_GET_CONTENTS(*i).dump(parser, os);
+}
+
+template <class BaseParser, class Keytype>
+prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
+        GenericTLVParser const & parser, Keytype const & key, std::ostream & os)
+    const
+{
+    typename Map::const_iterator i (map_.find( key));
+    if (i != map_.end())
+        PTRMAP_GET_CONTENTS(*i).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 PTRMAP_GET_CONTENTS(*i).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 PTRMAP_GET_CONTENTS(*i).bytes(parser);
+    else
+        throw TLVParserNotRegisteredException();
+}
+
+#undef PTRMAP_GET_CONTENTS
 
 ///////////////////////////////ct.e////////////////////////////////////////
 #undef prefix_