// $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
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);
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>
}
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();
+}
+
+template <class Self, class Registry>
+prefix_ senf::PacketTypeBase::factory_t senf::PacketTypeMixin<Self,Registry>::lookup(key_t key)
+{
+ PkReg_Entry const * entry (PacketRegistry<Registry>::lookup( key, senf::nothrow ));
+ return entry ? entry->factory() : PacketTypeBase::no_factory();
}
///////////////////////////////////////////////////////////////////////////
}
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();
}