X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Packets%2FPacketRegistry.cti;h=fa4096db0d0182d56ea7e54cc1df8d335d14b2bc;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=a09c249d3bb4642be9b5fdf9912653cd59f75360;hpb=ac6a813d9d99f7add4e13aff7a4bcd314d5604a6;p=senf.git

diff --git a/Packets/PacketRegistry.cti b/Packets/PacketRegistry.cti
index a09c249..fa4096d 100644
--- a/Packets/PacketRegistry.cti
+++ b/Packets/PacketRegistry.cti
@@ -1,9 +1,9 @@
 // $Id$
 //
-// Copyright (C) 2006 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// Copyright (C) 2006
+// 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
@@ -20,64 +20,126 @@
 // 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_
 
-
+
 // Local Variables:
 // mode: c++
+// fill-column: 100
 // c-file-style: "senf"
+// indent-tabs-mode: nil
+// ispell-local-dictionary: "american"
+// compile-command: "scons -u test"
+// comment-column: 40
 // End: