gdbus: Drop message replies if the sender requested no reply
PATCH 1/1 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.
---
gdbus/object.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
gdbus/object.c +0 -0
@@ -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;
Signature · 1 line
2.5.0
Luiz Augusto von Dentz
maintainerHi Philip,
Quoted 40 lines · Philip Withnall
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_NOREPLYwould 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.Signed-off-by Philip Withnall <[email protected]>Reviewed-by Simon McVittie <[email protected]>--- gdbus/object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)gdbus/object.c +2
-1@@ -258,7 +258,8 @@ static DBusHandlerResultprocess_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;
Quoted 2 lines
--
2.5.0
I fixed the coding style and remove Signed-off-by/Reviewed-By as those are not used in userspace.
Signature · 1 line
Luiz Augusto von Dentz