diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2015-12-02 15:36:42 +0000 |
|---|---|---|
| committer | Patrik Flykt <patrik.flykt@linux.intel.com> | 2015-12-29 11:24:26 +0200 |
| commit | 31ab23a8cc81abb7199acee7c975f6e65b1e2b9b (patch) | |
| tree | 35096e0f01f1874436ab340a639e1e0398861c63 | |
| parent | 4f1ac2ac87e1101cd7e3f35aa4d3f4c1a54b1a82 (diff) | |
| download | pacrunner-31ab23a8cc81abb7199acee7c975f6e65b1e2b9b.tar.gz | |
gdbus: Drop message replies if the sender requested no reply
If the sender flags a D-Bus message as not expecting a reply, it is
against system bus policy to send a reply — sending one will result in
errors being sent to us by dbus-daemon.
Magically drop all replies to messages which request no reply.
ofonod is one process which sends BlueZ messages which request no
reply,
when it is setting up a hands-free agent.
This is not a complete fix. In an ideal world, the existing check for
G_DBUS_METHOD_FLAG_NOREPLY would be dropped, as the server should be
prepared to return a reply to every method, if the client requests and
expects one — otherwise the client will time out. However, that’s a
much
bigger change with a much bigger risk of breaking things, so I’ll stick
with this for now.
| -rw-r--r-- | gdbus/object.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gdbus/object.c b/gdbus/object.c index 4cf2e2f..a220101 100644 --- a/gdbus/object.c +++ b/gdbus/object.c @@ -258,7 +258,8 @@ static DBusHandlerResult process_message(DBusConnection *connection, reply = method->function(connection, message, iface_user_data); - if (method->flags & G_DBUS_METHOD_FLAG_NOREPLY) { + if (method->flags & G_DBUS_METHOD_FLAG_NOREPLY || + dbus_message_get_no_reply(message)) { if (reply != NULL) dbus_message_unref(reply); return DBUS_HANDLER_RESULT_HANDLED; |