X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHMessageRegistry.hh;h=daa00c5f901f6efa5bd5b471b2b5aaeaf7b41b47;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=cf125d6bf8e3f1b82a537505d62d86ebadfd87db;hpb=ff305084cba283649a2c97e73d2608c3e4598683;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHMessageRegistry.hh b/senf/Packets/80221Bundle/MIHMessageRegistry.hh
index cf125d6..daa00c5 100644
--- a/senf/Packets/80221Bundle/MIHMessageRegistry.hh
+++ b/senf/Packets/80221Bundle/MIHMessageRegistry.hh
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2010
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief MIH Message-Registry public header */
@@ -31,52 +36,10 @@
 #include <senf/Utils/singleton.hh>
 #include <senf/Packets/Packets.hh>
 
-//#include "MIHMessageRegistry.mpp"
+#include "MIHMessageRegistry.ih"
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
-
 namespace senf {
 
-    namespace detail {
-
-        template<class T, typename Signature>
-        struct has_static_validate_member
-        {
-            template<Signature *>
-            struct helper;
-
-            template<class U>
-            static char test(helper<&U::validate> *);
-
-            template<class U>
-            static char (&test(...))[2];
-
-            static const bool value = sizeof(test<T>(0))==1;
-        };
-
-        struct MIHMessageRegistry_EntryBase {
-            virtual ~MIHMessageRegistry_EntryBase() {}
-            virtual std::pair<bool, std::string> validate(senf::Packet message) const = 0;
-        };
-
-        template <class MIHPacket,
-            bool use_validate_member = has_static_validate_member<typename MIHPacket::type, std::pair<bool, std::string>(MIHPacket)>::value>
-        struct MIHMessageRegistryEntry : MIHMessageRegistry_EntryBase
-        {
-            virtual std::pair<bool, std::string> validate(senf::Packet message) const {
-                return std::make_pair(true, "");
-            }
-        };
-
-        template <class MIHPacket>
-        struct MIHMessageRegistryEntry<MIHPacket, true> : MIHMessageRegistry_EntryBase
-        {
-            virtual std::pair<bool, std::string> validate(senf::Packet message) const {
-                return MIHPacket::type::validate(message.as<MIHPacket>());
-            }
-        };
-    }
-
-
     class MIHMessageRegistry
         : public senf::singleton<MIHMessageRegistry>
     {
@@ -94,7 +57,7 @@ namespace senf {
         template <typename MIHPacket>
         void registerMessageType();
 
-        std::pair<bool, std::string> validate(key_t messageId, senf::Packet message);
+        void validate(key_t messageId, senf::Packet message);
 
     private:
         typedef boost::ptr_map<key_t, detail::MIHMessageRegistry_EntryBase > Map;