X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FPacketType.ct;h=b4496ccf73493fbcbfbe63dcffe42cd7e13b7119;hb=refs%2Fheads%2Fmaster;hp=caec158fa3db3634b31bf79116ba943b303e43b8;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/PacketType.ct b/senf/Packets/PacketType.ct
index caec158..b4496cc 100644
--- a/senf/Packets/PacketType.ct
+++ b/senf/Packets/PacketType.ct
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2008
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Stefan Bund <g0dil@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):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief PacketType non-inline template implementation  */
@@ -28,22 +33,22 @@
 // Custom includes
 
 #define prefix_
-///////////////////////////////ct.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 // senf::PacketTypeMixin<Self,void>
 
 template <class Self>
 prefix_ senf::PacketInterpreterBase::optional_range
-senf::PacketTypeMixin<Self,void>::nextPacketRange(Packet const & p)
+senf::PacketTypeMixin<Self,void>::nextPacketRange(ConcretePacket<Self> const & p)
 {
     typename Self::size_type sz (Self::initHeadSize());
-    ///\idea This if condition could be replaced with a compile time switch by checking, wether
+    ///\idea This if condition could be replaced with a compile time switch by checking, whether
     /// (the function address) Self::initHeadSize is different from PacketTypeBase::initHeadSize
     if (sz == PacketTypeBase::size_type(-1)) {
-        typename Self::size_type headsz (bytes(p.as< ConcretePacket<Self> >().parser()));
-        return p.data().size() < headsz ? 
-            PacketTypeBase::no_range() : 
+        typename Self::size_type headsz (bytes(p.parser()));
+        return p.data().size() < headsz ?
+            PacketTypeBase::no_range() :
             PacketInterpreterBase::optional_range(
                 PacketTypeBase::range(boost::next(p.data().begin(), headsz),
                                       p.data().end()));
@@ -56,13 +61,13 @@ senf::PacketTypeMixin<Self,void>::nextPacketRange(Packet const & p)
         //
         // So, the helper only works with fixed-size parsers if the packet has a trailer.
         return p.data().size() < Self::initSize() ?
-            PacketTypeBase::no_range() : 
+            PacketTypeBase::no_range() :
             PacketInterpreterBase::optional_range(
                 PacketTypeBase::range(boost::next(p.data().begin(),sz),
                                       boost::prior(p.data().end(),Self::initSize()-sz)));
 }
 
-///////////////////////////////ct.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_