X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.ct;h=1fa98e33bbe51d0d87a2a39b22b4afc02bbef83d;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=28ae2be310b1abcd99f288ee239579e764577d06;hpb=0f235de98cae838afb42244ebd307ce8cd1db409;p=senf.git

diff --git a/senf/Packets/GenericTLV.ct b/senf/Packets/GenericTLV.ct
index 28ae2be..1fa98e3 100644
--- a/senf/Packets/GenericTLV.ct
+++ b/senf/Packets/GenericTLV.ct
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@berlios.de>
 //
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief GenericTLV non-inline template implementation  */
@@ -32,17 +37,17 @@
 #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 );
+{
+    PacketParserBase::size_type oldSize (bytes() );
+    PacketParserBase::size_type newParserSize ( senf::init_bytes<Parser>::value );
     this->resize(  oldSize, newParserSize);
     std::fill(this->i(), boost::next(this->i(), newParserSize), 0u);
     Parser concreteParser = Parser(this->i(), this->state() );
@@ -53,25 +58,25 @@ 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);
     } 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"
+           << "    type:   " << format::dumpint(this->type()) << "\n"
+           << "    length: " << 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 
+prefix_  senf::PacketInterpreterBase::range senf::GenericTLVParserBase<Base>::value()
+    const
 {
-    senf::PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
+    PacketData::iterator begin ( boost::next(this->i(), senf::bytes( self())) );
     return PacketInterpreterBase::range(begin, boost::next( begin, this->length()) );
 }
 
@@ -89,7 +94,7 @@ prefix_ void senf::GenericTLVParserBase<Base>::value_(ForwardReadableRange const
 }
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::GenericTLVParserRegistry<BaseParser,Keytype>
 
 template <class BaseParser, class Keytype>
@@ -102,6 +107,14 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::registerParser(
         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)
@@ -109,7 +122,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
 {
     typename Map::const_iterator i (map_.find( parser.type()));
     if (i != map_.end())
-        (i->second)->dump(parser, os);
+        PTRMAP_GET_CONTENTS(*i).dump(parser, os);
 }
 
 template <class BaseParser, class Keytype>
@@ -119,7 +132,7 @@ prefix_ void senf::GenericTLVParserRegistry<BaseParser,Keytype>::dump(
 {
     typename Map::const_iterator i (map_.find( key));
     if (i != map_.end())
-        (i->second)->dump(parser, os);
+        PTRMAP_GET_CONTENTS(*i).dump(parser, os);
 }
 
 template <class BaseParser, class Keytype>
@@ -129,14 +142,26 @@ prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserRegistry<BasePar
 {
     typename Map::const_iterator i (map_.find( parser.type()));
     if (i != map_.end())
-        return (i->second)->bytes(parser);
+        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_