From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Fri, 3 Jul 2015 12:50:04 +0000 (+0100)
Subject: dbus-monitor: disable automatic handling of o.fd.Peer messages
X-Git-Tag: dbus-1.9.18~1^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5d4900ad1635db2923d343c0373b6e2878082e53;p=thirdparty%2Fdbus.git

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
---

diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
index ff8390d7e..85fd738a1 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;