X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FGenericTLV.cti;h=bb07cb9a2bfaf0e208a9d73c09b86884fca91b9e;hb=HEAD;hp=55a4573d8f7eb1947022199df4b352270d9312e4;hpb=bea7cfcf3d02688ece159d76890acfe2d0051d71;p=senf.git

diff --git a/senf/Packets/GenericTLV.cti b/senf/Packets/GenericTLV.cti
index 55a4573..bb07cb9 100644
--- a/senf/Packets/GenericTLV.cti
+++ b/senf/Packets/GenericTLV.cti
@@ -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 inline template implementation */
@@ -28,15 +33,19 @@
 // Custom includes
 
 #define prefix_ inline
-///////////////////////////////cti.p///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::GenericTLVParserBase<Base>
 
 template <class Base>
 prefix_ senf::PacketParserBase::size_type senf::GenericTLVParserBase<Base>::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 <class Base>
@@ -82,8 +91,8 @@ template <class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         ForwardReadableRange const & val,
         typename boost::disable_if<senf::is_pair<ForwardReadableRange> >::type *)
-{ 
-    value_( val); 
+{
+    value_( val);
 }
 
 template <class Base>
@@ -91,8 +100,8 @@ template <class First, class Second>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         std::pair<First, Second> const & val,
         typename boost::disable_if<boost::is_convertible<First, typename Base::type_t::value_type> >::type *)
-{ 
-    value_( val); 
+{
+    value_( val);
 }
 
 template <class Base>
@@ -100,15 +109,15 @@ template <class Type, class ForwardReadableRange>
 prefix_ void senf::GenericTLVParserBase<Base>::value(
         std::pair<Type, ForwardReadableRange> const & val,
         typename boost::enable_if<boost::is_convertible<Type, typename Base::type_t::value_type> >::type *)
-{ 
+{
     this->type() = val.first;
-    value_( val.second); 
+    value_( val.second);
 }
 
 #endif
 
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::detail:GenericTLVParserRegistry_Entry<BaseParser, Parser>
 
 template <class BaseParser, class Parser>
@@ -119,12 +128,21 @@ prefix_ void senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::d
     (parser.template as<Parser>()).dump(os);
 }
 
-///////////////////////////////////////////////////////////////////////////
+template <class BaseParser, class Parser>
+prefix_ senf::PacketParserBase::size_type
+senf::detail::GenericTLVParserRegistry_Entry<BaseParser, Parser>::bytes(
+        GenericTLVParserBase<BaseParser> const & parser)
+    const
+{
+    return senf::bytes( parser.template as<Parser>());
+}
+
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::GenericTLVParserRegistry<BaseParser,Keytype>
 
 template <class BaseParser, class Keytype>
 prefix_ bool senf::GenericTLVParserRegistry<BaseParser,Keytype>::isRegistered(
-        GenericTLVParserBase<BaseParser> const & parser)
+        GenericTLVParser const & parser)
     const
 {
     typename Map::const_iterator i (map_.find( parser.type()));
@@ -139,7 +157,7 @@ prefix_ bool senf::GenericTLVParserRegistry<BaseParser,Keytype>::isRegistered(Ke
     return i != map_.end();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<PacketParser>
 
 template <class BaseParser, class Keytype>
@@ -149,7 +167,7 @@ prefix_ senf::GenericTLVParserRegistry<BaseParser,Keytype>::RegistrationProxy<Pa
     GenericTLVParserRegistry<BaseParser,Keytype>::instance().registerParser<PacketParser>();
 };
 
-///////////////////////////////cti.e///////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_