Custom message relays can be installed in Modules, relays can be uninstalled.

git-svn-id: http://yate.null.ro/svn/yate/trunk@1682 acf43c95-373e-0410-b603-e72c3f656dc1

engine/Channel.cpp

@@ -791,7 +791,9 @@ bool Module::installRelay(const char* name, int id, unsigned priority)
 	return true;
     m_relays |= id;
 
-    Engine::install(new MessageRelay(name,this,id,priority));
+    MessageRelay* relay = new MessageRelay(name,this,id,priority);
+    m_relayList.append(relay)->setDelete(false);
+    Engine::install(relay);
     return true;
 }
 
@@ -805,6 +807,26 @@ bool Module::installRelay(const char* name, unsigned priority)
     return installRelay(name,lookup(name,s_messages),priority);
 }
 
+bool Module::installRelay(MessageRelay* relay)
+{
+    if (!relay || ((relay->id() & m_relays) != 0) || m_relayList.find(relay))
+	return false;
+    m_relays |= relay->id();
+    m_relayList.append(relay)->setDelete(false);
+    Engine::install(relay);
+    return true;
+}
+
+bool Module::uninstallRelays()
+{
+    while (MessageRelay* relay = static_cast<MessageRelay*>(m_relayList.remove(false))) {
+	Engine::uninstall(relay);
+	m_relays &= ~relay->id();
+	relay->destruct();
+    }
+    return (0 == m_relays);
+}
+
 void Module::initialize()
 {
     setup();

yatengine.h

@@ -481,6 +481,13 @@ public:
     virtual bool received(Message& msg)
 	{ return m_receiver ? m_receiver->received(msg,m_id) : false; }
 
+    /**
+     * Get the ID of this message relay
+     * @return Numeric identifier passed to receiver
+     */
+    inline int id() const
+	{ return m_id; }
+
 private:
     MessageReceiver* m_receiver;
     int m_id;

yatephone.h

@@ -1350,6 +1350,19 @@ protected:
      */
     bool installRelay(const char* name, unsigned priority = 100);
 
+    /**
+     * Install a custom message relay
+     * @param relay Custom message relay
+     * @return True if installed, false if there was already one with same ID
+     */
+    bool installRelay(MessageRelay* relay);
+
+    /**
+     * Uninstall all installed relays in preparation for unloading
+     * @return True if all relays were uninstalled, false if something wrong
+     */
+    bool uninstallRelays();
+
     /**
      * Message receiver handler
      * @param msg The received message
@@ -1436,6 +1449,7 @@ protected:
 private:
     Module(); // no default constructor please
     static TokenDict s_messages[];
+    ObjList m_relayList;
     bool installRelay(const char* name, int id, unsigned priority);
 };