X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketType.cti;h=75be1a788f1accbe591a2ce8002c6e1f7337eb4a;hb=65ca2f5083d15049e6addcc58c9be10e5b8b8bc5;hp=e79d6b8d3c4f822a295d96440ede3a8ffd43f54d;hpb=a18d131c38ffe7178ea4736ed3f584125e9903ae;p=senf.git

diff --git a/Packets/PacketType.cti b/Packets/PacketType.cti
index e79d6b8..75be1a7 100644
--- a/Packets/PacketType.cti
+++ b/Packets/PacketType.cti
@@ -1,6 +1,8 @@
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// $Id$
+//
+// Copyright (C) 2007
+// 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
@@ -56,9 +58,7 @@ senf::PacketTypeMixin<Self,Registry>::nextPacketType(Packet p)
 {
     if (p.data().size() < Self::initSize())
         return Self::no_factory();
-    PkReg_Entry const * e (PacketRegistry<Registry>::lookup( 
-                               Self::nextPacketKey(p.as< ConcretePacket<Self> >()), nothrow));
-    return e ? e->factory() : PacketTypeBase::no_factory();
+    return lookup( Self::nextPacketKey(p.as< ConcretePacket<Self> >()) );
 }
 
 template <class Self, class Registry>
@@ -74,32 +74,22 @@ prefix_ void senf::PacketTypeMixin<Self,Registry>::init(Packet p)
 }
 
 template <class Self, class Registry>
-prefix_ typename senf::PacketTypeMixin<Self,Registry>::optional_registry_key_t
+prefix_ typename senf::PacketTypeMixin<Self,Registry>::optional_key_t
 senf::PacketTypeMixin<Self,Registry>::key(Packet p)
 {
-    return p ? PacketRegistry<Registry>::key(p, nothrow) : optional_registry_key_t();
+    return p ? PacketRegistry<Registry>::key(p, nothrow) : optional_key_t();
 }
 
-///////////////////////////////////////////////////////////////////////////
-// senf::PacketTypeMixin<Self,void>
-
-template <class Self>
-prefix_ senf::PacketInterpreterBase::optional_range
-senf::PacketTypeMixin<Self,void>::nextPacketRange(Packet p)
+template <class Self, class Registry>
+prefix_ senf::PacketTypeBase::factory_t senf::PacketTypeMixin<Self,Registry>::lookup(key_t key)
 {
-    if (p.data().size() < Self::initSize())
-        return PacketTypeBase::no_range();
-    typename Self::size_type sz (Self::initHeadSize());
-    ///\idea This if condition could be replaced with a compile time switch by checking, wether
-    /// (the function address) Self::initHeadSize is different from PacketTypeBase::initHeadSize
-    if (sz == PacketTypeBase::size_type(-1))
-        return PacketTypeBase::range(boost::next(p.data().begin(),Self::initSize()),
-                                     p.data().end());
-    else
-        return PacketTypeBase::range(boost::next(p.data().begin(),sz),
-                                     boost::prior(p.data().end(),Self::initSize()-sz));
+    PkReg_Entry const * entry (PacketRegistry<Registry>::lookup( key, senf::nothrow ));
+    return entry ? entry->factory() : PacketTypeBase::no_factory();
 }
 
+///////////////////////////////////////////////////////////////////////////
+// senf::PacketTypeMixin<Self,void>
+
 template <class Self>
 prefix_ senf::PacketInterpreterBase::size_type senf::PacketTypeMixin<Self,void>::initSize()
 {