From 602b3958fd240aa4332ec347d3210f39e80fc663 Mon Sep 17 00:00:00 2001
From: Tristan Hume <tris.hume@gmail.com>
Date: Fri, 1 May 2015 20:53:39 -0400
Subject: [PATCH] Handle signals properly.

---
 Rakefile              |  7 +++++++
 source/app.d          |  4 ++++
 source/ddbus/router.d | 26 +++++++++++++-------------
 3 files changed, 24 insertions(+), 13 deletions(-)
 create mode 100644 Rakefile

diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..78a8cf2
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,7 @@
+task :testCall do
+  sh "dbus-send --type=method_call --print-reply --dest=ca.thume.ddbus.test /root ca.thume.test.test int32:5"
+end
+
+task :testSignal do
+  sh "dbus-send --dest=ca.thume.ddbus.test /signaler ca.thume.test.signal int32:9"
+end
diff --git a/source/app.d b/source/app.d
index 69b660b..a91fd7f 100644
--- a/source/app.d
+++ b/source/app.d
@@ -24,6 +24,10 @@ void testServe(Connection conn) {
       writeln("Called with ", par);
       return par;
     });
+  patt = MessagePattern("/signaler","ca.thume.test","signal",true);
+  router.setHandler!(void,int)(patt,(int par) {
+      writeln("Signalled with ", par);
+    });
   registerRouter(conn, router);
   writeln("Getting name...");
   bool gotem = requestName(conn, "ca.thume.ddbus.test");
diff --git a/source/ddbus/router.d b/source/ddbus/router.d
index a26a779..3489aef 100644
--- a/source/ddbus/router.d
+++ b/source/ddbus/router.d
@@ -10,38 +10,34 @@ struct MessagePattern {
   string path;
   string iface;
   string method;
-  string sender;
+  bool signal;
 
   this(Message msg) {
     path = msg.path();
     iface = msg.iface();
     method = msg.member();
-    if(msg.type()==MessageType.Signal) {
-      sender = msg.sender();
-    } else {
-      sender = null;
-    }
+    signal = (msg.type() == MessageType.Signal);
   }
 
-  this(string path, string iface, string method, string sender = null) {
+  this(string path, string iface, string method, bool signal = false) {
     this.path = path;
     this.iface = iface;
     this.method = method;
-    this.sender = sender;
+    this.signal = signal;
   }
 
   size_t toHash() const @safe nothrow {
     size_t hash = 0;
     auto stringHash = &(typeid(path).getHash);
-    hash += stringHash(&sender);
     hash += stringHash(&path);
     hash += stringHash(&iface);
     hash += stringHash(&method);
+    hash += (signal?1:0);
     return hash;
   }
 
   bool opEquals(ref const this s) const @safe pure nothrow {
-    return (path == s.path) && (iface == s.iface) && (method == s.method) && (sender == s.sender);
+    return (path == s.path) && (iface == s.iface) && (method == s.method) && (signal == s.signal);
   }
 }
 
@@ -54,6 +50,7 @@ class MessageRouter {
     if(type != MessageType.Call && type != MessageType.Signal)
       return false;
     auto pattern = MessagePattern(msg);
+    // import std.stdio; debug writeln("Handling ", pattern);
     HandlerFunc* handler = (pattern in callTable);
     if(handler is null) return false;
     (*handler)(msg,conn);
@@ -63,12 +60,15 @@ class MessageRouter {
   void setHandler(Ret, Args...)(MessagePattern patt, Ret delegate(Args) handler) {
     void handlerWrapper(Message call, Connection conn) {
       Tuple!Args args = call.readTuple!(Tuple!Args)();
-      Ret ret = handler(args.expand);
       auto retMsg = call.createReturn();
       static if(!is(Ret == void)) {
+        Ret ret = handler(args.expand);
         retMsg.build(ret);
+      } else {
+        handler(args.expand);
       }
-      conn.send(retMsg);
+      if(!patt.signal)
+        conn.send(retMsg);
     }
     callTable[patt] = &handlerWrapper;
   }
@@ -103,6 +103,6 @@ unittest {
   auto msg = Message("org.example.test", "/test","org.example.testing","testMethod");
   auto patt= new MessagePattern(msg);
   patt.assertEqual(patt);
-  patt.sender.assertNull();
+  patt.signal.assertFalse();
   patt.path.assertEqual("/test");
 }