X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketType.cti;h=1b7e69369cdd9e42c1d0b01a5ca8023fbb442ece;hb=3863d46dd898b7bc35ea8c6ccd8563b18762a6b6;hp=5d1ec9d7711b6874722f3c3b6997977bcf6a4e5b;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Packets/PacketType.cti b/Packets/PacketType.cti
index 5d1ec9d..1b7e693 100644
--- a/Packets/PacketType.cti
+++ b/Packets/PacketType.cti
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -46,7 +46,7 @@ prefix_ senf::PacketTypeBase::factory_t senf::PacketTypeBase::factory()
 
 template <class Self, class Registry>
 prefix_ senf::PacketInterpreterBase::optional_range
-senf::PacketTypeMixin<Self,Registry>::nextPacketRange(Packet p)
+senf::PacketTypeMixin<Self,Registry>::nextPacketRange(Packet const & p)
 {
     // Call the member defined in the specialization below
     return PacketTypeMixin<Self>::nextPacketRange(p);
@@ -54,13 +54,11 @@ senf::PacketTypeMixin<Self,Registry>::nextPacketRange(Packet p)
 
 template <class Self, class Registry>
 prefix_ senf::PacketInterpreterBase::factory_t
-senf::PacketTypeMixin<Self,Registry>::nextPacketType(Packet p)
+senf::PacketTypeMixin<Self,Registry>::nextPacketType(Packet const & 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>
@@ -70,38 +68,28 @@ prefix_ senf::PacketInterpreterBase::size_type senf::PacketTypeMixin<Self,Regist
 }
 
 template <class Self, class Registry>
-prefix_ void senf::PacketTypeMixin<Self,Registry>::init(Packet p)
+prefix_ void senf::PacketTypeMixin<Self,Registry>::init(Packet const & p)
 {
     p.as< ConcretePacket<Self> >()->init();
 }
 
 template <class Self, class Registry>
-prefix_ typename senf::PacketTypeMixin<Self,Registry>::optional_registry_key_t
-senf::PacketTypeMixin<Self,Registry>::key(Packet p)
+prefix_ typename senf::PacketTypeMixin<Self,Registry>::optional_key_t
+senf::PacketTypeMixin<Self,Registry>::key(Packet const & 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()
 {
@@ -109,7 +97,7 @@ prefix_ senf::PacketInterpreterBase::size_type senf::PacketTypeMixin<Self,void>:
 }
 
 template <class Self>
-prefix_ void senf::PacketTypeMixin<Self,void>::init(Packet p)
+prefix_ void senf::PacketTypeMixin<Self,void>::init(Packet const & p)
 {
     p.as< ConcretePacket<Self> >()->init();
 }