summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2014-10-23 12:20:06 +0200
committerDavid Herrmann <dh.herrmann@gmail.com>2014-10-23 12:20:06 +0200
commit64d04a705fa9c731cdca440303fa52b8ab30f9a1 (patch)
treea28f3b189b66de27817016f315c427a92a3db1a1
parenta8adec5ddeb21dae91bab180abf3e2dc879f9102 (diff)
downloadkdbus-bus-64d04a705fa9c731cdca440303fa52b8ab30f9a1.tar.gz
kdbus-bus-64d04a705fa9c731cdca440303fa52b8ab30f9a1.tar.bz2
kdbus-bus-64d04a705fa9c731cdca440303fa52b8ab30f9a1.zip
connection: don't send DEAD-NOTIFICATIONS on sync SENDs
If we synchronously send messages, we never queue notifications on the sender if a timeout or reset occurs. Fix the DEAD_DESTINATION handling to not queue such messages either. Signed-off-by: David Herrmann <dh.herrmann@gmail.com>
-rw-r--r--connection.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/connection.c b/connection.c
index 52c4d9b76b1..60a38410d95 100644
--- a/connection.c
+++ b/connection.c
@@ -251,11 +251,10 @@ int kdbus_cmd_msg_recv(struct kdbus_conn *conn,
} else {
list_del_init(&entry->reply->entry);
kdbus_conn_reply_free(entry->reply);
+ kdbus_notify_reply_dead(conn->bus,
+ entry->src_id,
+ entry->cookie);
}
-
- kdbus_notify_reply_dead(conn->bus,
- entry->src_id,
- entry->cookie);
}
kdbus_queue_entry_remove(conn, entry);