diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-07-03 13:50:04 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2015-07-21 17:18:08 +0100 |
| commit | 5d4900ad1635db2923d343c0373b6e2878082e53 (patch) | |
| tree | ed16cef5a06c14e94eea10e19d7ef2e2023f95f8 | |
| parent | 9c74286dee3c181008c5ce41e473bb1b164b385a (diff) | |
| download | dbus-5d4900ad1635db2923d343c0373b6e2878082e53.tar.gz | |
dbus-monitor: disable automatic handling of o.fd.Peer messages
A normal DBusConnection will automatically reply to o.fd.Peer
messages such as Ping. We don't want this: we'll
confuse everyone else by replying to messages that weren't
intended for us.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=90952
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
(cherry picked from commit d9ee040d0bff2b421bca80c2339dcd9347d906db,
commit message adjusted to describe the impact in versions < 1.9)
Conflicts:
tools/dbus-monitor.c
| -rw-r--r-- | tools/dbus-monitor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c index ff8390d7..85fd738a 100644 --- a/tools/dbus-monitor.c +++ b/tools/dbus-monitor.c @@ -365,6 +365,11 @@ main (int argc, char *argv[]) exit (1); } + /* Receive o.fd.Peer messages as normal messages, rather than having + * libdbus handle them internally, which is the wrong thing for + * a monitor */ + dbus_connection_set_route_peer_messages (connection, TRUE); + if (numFilters) { size_t offset = 0; |