Attachment 56875 Details for Bug 45896 – Remove duplicate nonce-tcp (service-side) transport on Windows

[patch] Remove duplicate nonce-tcp (service-side) transport on Windows

0001-Remove-duplicate-nonce-tcp-service-side-transport-on.patch (text/plain), 1.84 KB, created by Simon McVittie on 2012-02-10 07:23:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2012-02-10 07:23:22 UTC

Size: 1.84 KB

patch

obsolete

>From 665daa360eb9eddb4bbeb02ac74c8bf8f39c9db2 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Fri, 10 Feb 2012 15:22:16 +0000
>Subject: [PATCH] Remove duplicate nonce-tcp (service-side) transport on
> Windows
>
>Turns out this was duplicated too. We can just use the
>platform-independent version, which uses the same code.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=45896
>Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
>---
> dbus/dbus-server-win.c |   28 +---------------------------
> 1 files changed, 1 insertions(+), 27 deletions(-)
>
>diff --git a/dbus/dbus-server-win.c b/dbus/dbus-server-win.c
>index bf1c896..bb6da48 100644
>--- a/dbus/dbus-server-win.c
>+++ b/dbus/dbus-server-win.c
>@@ -57,33 +57,7 @@ _dbus_server_listen_platform_specific (DBusAddressEntry *entry,
> 
>   method = dbus_address_entry_get_method (entry);
> 
>-  if (strcmp (method, "nonce-tcp") == 0)
>-    {
>-      const char *host;
>-      const char *port;
>-      const char *bind;
>-      const char *family;
>-
>-      host = dbus_address_entry_get_value (entry, "host");
>-      bind = dbus_address_entry_get_value (entry, "bind");
>-      port = dbus_address_entry_get_value (entry, "port");
>-      family = dbus_address_entry_get_value (entry, "family");
>-
>-      *server_p = _dbus_server_new_for_tcp_socket (host, bind, port,
>-                                                   family, error, TRUE);
>-
>-      if (*server_p)
>-        {
>-          _DBUS_ASSERT_ERROR_IS_CLEAR(error);
>-          return DBUS_SERVER_LISTEN_OK;
>-        }
>-      else
>-        {
>-          _DBUS_ASSERT_ERROR_IS_SET(error);
>-          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>-        }
>-    }
>-  else if (strcmp (method, "autolaunch") == 0)
>+  if (strcmp (method, "autolaunch") == 0)
>     {
>       const char *host = "localhost";
>       const char *bind = "localhost";
>-- 
>1.7.9
>

Actions: View | Splinter Review

Attachments on bug 45896: 56874 | 56875 | 57582

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.