// $Id$
//
// Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-// Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
// Free Software Foundation, Inc.,
// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-// Definition of inline template funPacketRegistry.ons
+/** \file
+ \brief PacketRegistry inline template implementation */
#include "PacketRegistry.ih"
// Custom includes
-#include "Packet.hh"
#define prefix_ inline
///////////////////////////////PacketRegistry..p///////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
+// senf::PacketRegistry<Tag>::RegistrationProxy<PacketType>
+
template <class Tag>
-template <class OtherPacket>
-prefix_ void senf::PacketRegistry<Tag>::registerPacket(typename Tag::key_t key)
+template <class PacketType>
+prefix_ senf::PacketRegistry<Tag>::RegistrationProxy<PacketType>::
+RegistrationProxy(typename Tag::key_t key)
{
- registry().registerPacket<OtherPacket>(key);
+ PacketRegistry<Tag>::template registerPacket<PacketType>(key);
}
+///////////////////////////////////////////////////////////////////////////
+// senf::PacketRegistry<Tag>
+
template <class Tag>
-template <class OtherPacket>
-prefix_ senf::PacketRegistry<Tag>::RegistrationProxy<OtherPacket>::
-RegistrationProxy(typename Tag::key_t key)
+template <class PacketType>
+prefix_ void senf::PacketRegistry<Tag>::registerPacket(typename Tag::key_t key)
{
- PacketRegistry<Tag>::template registerPacket<OtherPacket>(key);
+ registry().registerPacket<PacketType>(key);
}
template <class Tag>
-template <class OtherPacket>
+template <class PacketType>
prefix_ typename Tag::key_t senf::PacketRegistry<Tag>::key()
{
- return registry().key(senf::typeIdValue<OtherPacket>());
+ return registry().key(senf::typeIdValue<PacketType>());
+}
+
+template <class Tag>
+template <class PacketType>
+prefix_ typename boost::optional<typename Tag::key_t> senf::PacketRegistry<Tag>::key(NoThrow_t)
+{
+ return registry().key(senf::typeIdValue<PacketType>(),true);
+}
+
+template <class Tag>
+prefix_ typename Tag::key_t senf::PacketRegistry<Tag>::key(Packet const & packet)
+{
+ return registry().key(packet.typeId());
+}
+
+template <class Tag>
+prefix_ typename boost::optional<typename Tag::key_t>
+senf::PacketRegistry<Tag>::key(Packet const & packet, NoThrow_t)
+{
+ return registry().key(packet.typeId(),true);
+}
+
+template <class Tag>
+prefix_ senf::PkReg_Entry const & senf::PacketRegistry<Tag>::lookup(typename Tag::key_t key)
+{
+ return registry().lookup(key);
+}
+
+template <class Tag>
+prefix_ senf::PkReg_Entry const * senf::PacketRegistry<Tag>::lookup(typename Tag::key_t key,
+ NoThrow_t)
+{
+ return registry().lookup(key,true);
+}
+
+template <class Tag>
+prefix_ typename senf::PacketRegistry<Tag>::iterator senf::PacketRegistry<Tag>::begin()
+{
+ return registry().begin();
+}
+
+template <class Tag>
+prefix_ typename senf::PacketRegistry<Tag>::iterator senf::PacketRegistry<Tag>::end()
+{
+ return registry().end();
+}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::detail::PacketRegistryImpl<KeyType>
+
+template <class KeyType>
+prefix_ senf::detail::PacketRegistryImpl<KeyType>::PacketRegistryImpl(std::string const & name)
+{
+ registries()[name] = this;
}
template <class KeyType>
-template <class OtherPacket>
-prefix_ void
-senf::impl::PacketRegistryImpl<KeyType>::registerInterpreter(Packet * p,
- Packet::iterator b,
- Packet::iterator e)
+prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::iterator
+senf::detail::PacketRegistryImpl<KeyType>::begin()
+ const
{
- p->registerInterpreter<OtherPacket>(b,e);
+ return boost::make_transform_iterator(
+ registry_.begin(), ::__gnu_cxx::select1st<typename PacketMap::value_type>());
}
-template <class Tag, class Derived>
-prefix_ void
-senf::PacketRegistryMixin<Tag,Derived>::registerInterpreter(typename Tag::key_t key,
- Packet::iterator b,
- Packet::iterator e)
+template <class KeyType>
+prefix_ typename senf::detail::PacketRegistryImpl<KeyType>::iterator
+senf::detail::PacketRegistryImpl<KeyType>::end()
const
{
- PacketRegistry<Tag>::registry().lookup(key)->registerInterpreter(
- static_cast<Derived const * const>(this),b,e);
+ return boost::make_transform_iterator(
+ registry_.end(), ::__gnu_cxx::select1st<typename PacketMap::value_type>());
}
///////////////////////////////PacketRegistry..e///////////////////////////////////////
#undef prefix_
-\f
+
// Local Variables:
// mode: c++
// fill-column: 100
// indent-tabs-mode: nil
// ispell-local-dictionary: "american"
// compile-command: "scons -u test"
+// comment-column: 40
// End: