Attachment 87315 Details for Bug 66107 – [PATCH v2] dbus-monitor: keep backwards compatibility

[patch] [PATCH v2] dbus-monitor: keep backwards compatibility

0001-dbus-monitor-keep-backwards-compatibility.patch (text/plain), 2.66 KB, created by Chengwei Yang on 2013-10-09 02:46:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chengwei Yang

Created: 2013-10-09 02:46:28 UTC

Size: 2.66 KB

patch

obsolete

>From a40356ec4a7e69a9440b08eee48fca58b693e082 Mon Sep 17 00:00:00 2001
>From: Chengwei Yang <chengwei.yang@intel.com>
>Date: Wed, 9 Oct 2013 10:44:12 +0800
>Subject: [PATCH v2] dbus-monitor: keep backwards compatibility
>
>eavesdropping as a match rule key introduced in DBus 1.5.6, and the
>privous implementation doesn't keep backwards compatibility with older
>dbus-daemon.
>
>And the reference dbus-daemon implementation just fail if unknwon key
>found in match rule, this is undefined hehavior in DBus Sepcification.
>
>Also there is a feature request for change this hehavior to
>"ignore unknown key in match rule", See
>https://bugs.freedesktop.org/show_bug.cgi?id=66114
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66107
>---
> tools/dbus-monitor.c |   31 +++++++++++++++++++++++++------
> 1 file changed, 25 insertions(+), 6 deletions(-)
>
>diff --git a/tools/dbus-monitor.c b/tools/dbus-monitor.c
>index 1aa885f..ff8390d 100644
>--- a/tools/dbus-monitor.c
>+++ b/tools/dbus-monitor.c
>@@ -367,26 +367,45 @@ main (int argc, char *argv[])
> 
>   if (numFilters)
>     {
>+      size_t offset = 0;
>       for (i = 0; i < j; i++)
>         {
>-          dbus_bus_add_match (connection, filters[i], &error);
>-          if (dbus_error_is_set (&error))
>+          dbus_bus_add_match (connection, filters[i] + offset, &error);
>+          if (dbus_error_is_set (&error) && i == 0 && offset == 0)
>+            {
>+              /* We might be talking to a pre-1.5.6 dbus-daemon
>+              * which wouldn't understand eavesdrop=true.
>+              * If this works, carry on with offset > 0
>+              * on the remaining iterations. */
>+              offset = strlen (EAVESDROPPING_RULE) + 1;
>+              dbus_error_free (&error);
>+              dbus_bus_add_match (connection, filters[i] + offset, &error);
>+            }
>+
>+	  if (dbus_error_is_set (&error))
>             {
>               fprintf (stderr, "Failed to setup match \"%s\": %s\n",
>                        filters[i], error.message);
>               dbus_error_free (&error);
>               exit (1);
>             }
>-	  free(filters[i]);
>+          free(filters[i]);
>         }
>     }
>   else
>     {
>       dbus_bus_add_match (connection,
>-		          EAVESDROPPING_RULE,
>-		          &error);
>+                          EAVESDROPPING_RULE,
>+                          &error);
>       if (dbus_error_is_set (&error))
>-        goto lose;
>+        {
>+          dbus_error_free (&error);
>+          dbus_bus_add_match (connection,
>+                              "",
>+                              &error);
>+          if (dbus_error_is_set (&error))
>+            goto lose;
>+        }
>     }
> 
>   if (!dbus_connection_add_filter (connection, filter_func, NULL, NULL)) {
>-- 
>1.7.9.5
>

Actions: View | Splinter Review

Attachments on bug 66107: 81301 | 81438 | 81439 | 81440 | 87315

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.