@@ -2,6 +2,7 @@

  * $Id$

  *

  * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

  *

  * This file is part of sems, a free SIP media server.

  *

@@ -55,7 +56,18 @@ void AmSessionFactory::configureSession(AmSession* sess) {

     //SessionTimer::sess->configureSessionTimer(mod_conf);

 }

+void AmSessionFactory::postEvent(AmEvent* ev) {

+	ERROR("unhandled Event in %s module\n", getName().c_str());

+	delete ev;

+}

+

 AmSessionEventHandlerFactory::AmSessionEventHandlerFactory(const string& name)

 	: AmPluginFactory(name) 

 {

 }

+

+AmSIPEventHandler::AmSIPEventHandler(const string& name) 

+    : AmPluginFactory(name) 

+{

+}

+

@@ -2,6 +2,7 @@

  * $Id$

  *

  * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

  *

  * This file is part of sems, a free SIP media server.

  *

@@ -29,6 +30,7 @@

 #include "AmThread.h"

 #include "AmSipRequest.h"

+#include "AmSipReply.h"

 #include "AmConfig.h"

 #include "AmArg.h"

@@ -141,8 +143,40 @@ public:

      *   processing as it would block the server.

      */

     virtual AmSession* onInvite(const AmSipRequest& req)=0;

+

+    /**

+     * method to receive an Event that is posted

+	 * to  the factory

+	 *

+     * Warning:

+     *   This method should not make any expensive

+     *   processing as it would block the thread 

+	 *   posting the event!

+     */

+    virtual void postEvent(AmEvent* ev);	

+

 };

+/** \brief Interface for plugins that implement session-less 

+ *     UA behaviour (e.g. registrar client, event notification 

+ *     client)

+ */

+class AmSIPEventHandler : public AmPluginFactory 

+{

+

+public:

+	AmSIPEventHandler(const string& name);

+	virtual ~AmSIPEventHandler() { }

+

+	/** will be called on incoming replies which do 

+	 *  not belong to a dialog of a session in the 

+	 *  SessionContainer.

+	 *

+	 *  @return true if reply was handled by plugin, false 

+	 *          otherwise

+	 */

+	virtual bool onSipReply(const AmSipReply& rep) = 0;

+};

 #if  __GNUC__ < 3

 #define EXPORT_FACTORY(fctname,class_name,args...) \

@@ -181,6 +215,12 @@ typedef void* (*FactoryCreate)();

 #define EXPORT_PLUGIN_CLASS_FACTORY(class_name,app_name) \

             EXPORT_FACTORY(FACTORY_PLUGIN_CLASS_EXPORT,class_name,app_name)

+#define FACTORY_SIP_EVENT_HANDLER_EXPORT     sip_evh_factory_create

+#define FACTORY_SIP_EVENT_HANDLER_EXPORT_STR XSTR(FACTORY_SIP_EVENT_HANDLER_EXPORT)

+

+#define EXPORT_SIP_EVENT_HANDLER_FACTORY(class_name,app_name) \

+            EXPORT_FACTORY(FACTORY_SIP_EVENT_HANDLER_EXPORT,class_name,app_name)

+

 #endif

 // Local Variables:

 // mode:C++

@@ -1,3 +1,31 @@

+/*

+ * $Id$

+ *

+ * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

+ *

+ * This file is part of sems, a free SIP media server.

+ *

+ * sems 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

+ *

+ * For a license to use the ser software under conditions

+ * other than those described here, or to purchase support for this

+ * software, please contact iptel.org by e-mail at the following addresses:

+ *    info@iptel.org

+ *

+ * sems 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.

+ *

+ * 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

+ */

+

 #include "AmInterfaceHandler.h"

 #include "AmCtrlInterface.h"

 #include "AmSessionContainer.h"

@@ -228,16 +256,22 @@ int AmReplyHandler::handleRequest(AmCtrlInterface* ctrl)

 	return -1;

     }

-    AmSessionContainer::instance()->postEvent(

-	    reply.local_tag,

-	    new AmSipReplyEvent(reply));

-

-//     if(reply.code >= 200)

-// 	cleanup(ctrl);

+    if (!AmSessionContainer::instance()->postEvent(

+		   reply.local_tag,

+		   new AmSipReplyEvent(reply))) {

+		for (vector<AmSIPEventHandler*>::iterator it = 

+				 reply_handlers.begin(); it != reply_handlers.end(); it++)

+			if ((*it)->onSipReply(reply))

+				break;			

+	}

     return 0;

 }

+void AmReplyHandler::registerReplyHandler(AmSIPEventHandler* eh) {

+	reply_handlers.push_back(eh);

+}

+

 AmRequestHandlerFct* AmRequestHandler::getFct(const string& name)

 {

     AmRequestHandlerFct* fct=NULL;

@@ -1,3 +1,31 @@

+/*

+ * $Id$

+ *

+ * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

+ *

+ * This file is part of sems, a free SIP media server.

+ *

+ * sems 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

+ *

+ * For a license to use the ser software under conditions

+ * other than those described here, or to purchase support for this

+ * software, please contact iptel.org by e-mail at the following addresses:

+ *    info@iptel.org

+ *

+ * sems 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.

+ *

+ * 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

+ */

+

 #ifndef AmInterfaceHandler_h

 #define AmInterfaceHandler_h

@@ -6,11 +34,15 @@

 #include <string>

 #include <map>

+#include <vector>

 using std::string;

 using std::map;

+using std::vector;

 class AmCtrlInterface;

+class AmSIPEventHandler;

+

 /** \brief interface of an InterfaceHandler */

 class AmInterfaceHandler

 {

@@ -69,19 +101,18 @@ class AmReplyHandler: public AmInterfaceHandler

     AmCtrlInterface* m_ctrl;

     AmReplyHandler(AmCtrlInterface* ctrl);

-//     void cleanup(AmCtrlInterface* ctrl);

+	vector<AmSIPEventHandler*> reply_handlers;

 public:

     static AmReplyHandler* get();

     AmCtrlInterface* getCtrl() { return m_ctrl; }

-

-//     AmCtrlInterface* getNewCtrl(const string& callid,

-// 				const string& remote_tag,

-// 				const string& local_tag,

-// 				int           cseq);

     int handleRequest(AmCtrlInterface* ctrl);

+

+	/** register a reply handler for incoming replies pertaining 

+	 * to a dialog without a session (not in SessionContainer) */

+	void registerReplyHandler(AmSIPEventHandler* eh);

 };

 #endif

@@ -2,6 +2,7 @@

  * $Id$

  *

  * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

  *

  * This file is part of sems, a free SIP media server.

  *

@@ -28,6 +29,7 @@

 #include "AmPlugIn.h"

 #include "AmConfig.h"

 #include "AmApi.h"

+#include "AmInterfaceHandler.h"

 #include "amci/amci.h"

 #include "amci/codecs.h"

@@ -130,6 +132,17 @@ int AmPlugIn::load(const string& directory)

 	if(err)

 	    break;

     }

+

+	// load SIPEventHandlers 

+    for(map<string,AmSIPEventHandler*>::iterator it = name2sipeh.begin();

+	it != name2sipeh.end(); it++){

+	err = it->second->onLoad();

+	if(err)

+	    break;

+	// register for receiving replys 

+	AmReplyHandler::get()->registerReplyHandler(it->second);

+    }

+

     map<string,AmSessionFactory*> apps(name2app);

     for(map<string,AmSessionFactory*>::iterator it = apps.begin();

@@ -275,6 +288,14 @@ AmDynInvokeFactory* AmPlugIn::getFactory4Di(const string& name)

   return 0;

 }

+AmSIPEventHandler* AmPlugIn::getFactory4SIPeh(const string& name)

+{

+  map<string,AmSIPEventHandler*>::iterator it = name2sipeh.find(name);

+  if(it != name2sipeh.end())

+    return it->second;

+  return 0;

+}

+

 int AmPlugIn::loadAudioPlugIn(amci_exports_t* exports)

 {

     if(!exports){

@@ -376,6 +397,28 @@ int AmPlugIn::loadDiPlugIn(AmPluginFactory* f)

     return -1;

 }

+int AmPlugIn::loadSIPehPlugIn(AmPluginFactory* f)

+{

+    AmSIPEventHandler* sf = dynamic_cast<AmSIPEventHandler*>(f);

+    if(!sf){

+        ERROR("invalid SIP event handler plug-in!\n");

+        goto error;

+    }

+

+    if(name2sipeh.find(sf->getName()) != name2sipeh.end()){

+        ERROR("sip event handler component '%s' already loaded !\n",

+			  sf->getName().c_str());

+        goto error;

+    }

+      

+    name2sipeh.insert(std::make_pair(sf->getName(),sf));

+    DBG("sip event handler component '%s' loaded.\n",sf->getName().c_str());

+

+    return 0;

+

+ error:

+    return -1;

+}

 int AmPlugIn::addCodec(amci_codec_t* c)

 {

@@ -2,6 +2,7 @@

  * $Id$

  *

  * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

  *

  * This file is part of sems, a free SIP media server.

  *

@@ -39,6 +40,7 @@ class AmPluginFactory;

 class AmSessionFactory;

 class AmSessionEventHandlerFactory;

 class AmDynInvokeFactory;

+class AmSIPEventHandler;

 struct amci_exports_t;

 struct amci_codec_t;

@@ -69,6 +71,7 @@ private:

     map<string,AmSessionEventHandlerFactory*> name2seh;

     map<string,AmDynInvokeFactory*> name2di;

+    map<string,AmSIPEventHandler*> name2sipeh;

     int dynamic_pl; // range: 96->127, see RFC 1890

@@ -81,6 +84,7 @@ private:

     int loadAppPlugIn(AmPluginFactory* cb);

     int loadSehPlugIn(AmPluginFactory* cb);

     int loadDiPlugIn(AmPluginFactory* cb);

+	int loadSIPehPlugIn(AmPluginFactory* f);

     int addCodec(amci_codec_t* c);

     int addPayload(amci_payload_t* p);

@@ -144,13 +148,15 @@ private:

      */

     AmDynInvokeFactory* getFactory4Di(const string& name);

+    /**

+     * SIP event handler lookup function

+     * @param name application name

+     * @return NULL if failed (-> handler not found).

+     */

+    AmSIPEventHandler* getFactory4SIPeh(const string& name);

+

     /** @return true if this record has been inserted. */

     bool registerFactory4App(const string& app_name, AmSessionFactory* f);

 };

 #endif

-

-// Local Variables:

-// mode:C++

-// End:

-

@@ -1,3 +1,31 @@

+/*

+ * $Id$

+ *

+ * Copyright (C) 2002-2003 Fhg Fokus

+ * Copyright (C) 2006 iptego GmbH

+ *

+ * This file is part of sems, a free SIP media server.

+ *

+ * sems 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

+ *

+ * For a license to use the ser software under conditions

+ * other than those described here, or to purchase support for this

+ * software, please contact iptel.org by e-mail at the following addresses:

+ *    info@iptel.org

+ *

+ * sems 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.

+ *

+ * 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

+ */

+

 #include "AmSessionContainer.h"

 #include "AmPlugIn.h"

 #include "AmApi.h"

@@ -264,19 +292,24 @@ bool AmSessionContainer::postEvent(const string& local_tag,

 				   AmEvent* event) 

 {

 //     DBG("postEvent: local_tag = %s\n",local_tag.c_str());

-

     as_mut.lock();

     AmSession* s = getSession(local_tag);

     as_mut.unlock();

-    

-    if(!s){

+

+	if (s  != NULL) {

+		s->postEvent(event);

+		return true;

+	}    

+	

+	// try session factories

+	AmSessionFactory* sf = AmPlugIn::instance()->getFactory4App(local_tag);

+	if (sf != NULL) {

+		sf->postEvent(event);

+		return true;

+	}

+

 	delete event;

 	return false;

-    }

-    

-//     DBG("posting...\n");

-    s->postEvent(event);

-    return true;

 }

 AmSession* AmSessionContainer::createSession(AmSipRequest& req)