Attachment 137885 Details for Bug 61922 – Let dbus-daemon be more descriptive in case of ipv6 listen errors on Windows

[patch] Let dbus-daemon be more descriptive in case of ipv6 listen errors on Windows

Let-dbus-daemon-be-more-descriptive-in-case-of-ipv.patch (text/plain), 2.32 KB, created by Ralf Habacker on 2018-03-08 08:43:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2018-03-08 08:43:45 UTC

Size: 2.32 KB

patch

obsolete

>From e8642adaeb4fb683286e63967c43fc91eef833b5 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Wed, 14 Feb 2018 14:13:50 +0100
>Subject: [PATCH] Let dbus-daemon be more descriptive in case of ipv6 listen
> errors on Windows
>
>In case the host does not have ipv6 support and no family is specified
>in a tcp listen address dbus daemon prints out a cryptic message 'Failed
>to bind socket "localhost:xxx": Invalid argument', which is changed to
>'Failed to start message bus: No ipv6 support available' with this patch.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=61922
>---
> dbus/dbus-sysdeps-win.c | 28 ++++++++++++++++++++++++----
> 1 file changed, 24 insertions(+), 4 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
>index 597f50f0..55239010 100644
>--- a/dbus/dbus-sysdeps-win.c
>+++ b/dbus/dbus-sysdeps-win.c
>@@ -1590,11 +1590,21 @@ _dbus_connect_tcp_socket_with_nonce (const char     *host,
>   else if (!strcmp(family, "ipv4"))
>     hints.ai_family = AF_INET;
>   else if (!strcmp(family, "ipv6"))
>-    hints.ai_family = AF_INET6;
>+    {
>+      if (_dbus_has_ipv6 ())
>+          hints.ai_family = AF_INET6;
>+      else
>+        {
>+          dbus_set_error (error,
>+                          DBUS_ERROR_BAD_ADDRESS,
>+                          "No ipv6 support available");
>+          return _dbus_socket_get_invalid ();
>+        }
>+    }
>   else
>     {
>       dbus_set_error (error,
>-                      DBUS_ERROR_INVALID_ARGS,
>+                      DBUS_ERROR_BAD_ADDRESS,
>                       "Unknown address family %s", family);
>       return _dbus_socket_get_invalid ();
>     }
>@@ -1741,11 +1751,21 @@ _dbus_listen_tcp_socket (const char     *host,
>   else if (!strcmp(family, "ipv4"))
>     hints.ai_family = AF_INET;
>   else if (!strcmp(family, "ipv6"))
>-    hints.ai_family = AF_INET6;
>+    {
>+      if (_dbus_has_ipv6 ())
>+          hints.ai_family = AF_INET6;
>+      else
>+        {
>+          dbus_set_error (error,
>+                          DBUS_ERROR_BAD_ADDRESS,
>+                          "No ipv6 support available", "");
>+          return -1;
>+        }
>+    }
>   else
>     {
>       dbus_set_error (error,
>-                      DBUS_ERROR_INVALID_ARGS,
>+                      DBUS_ERROR_BAD_ADDRESS,
>                       "Unknown address family %s", family);
>       return -1;
>     }
>-- 
>2.12.3

Actions: View | Splinter Review

Attachments on bug 61922: 112995 | 135874 | 137355 | 137356 | 137863 | 137882 | 137883 | 137884 | 137885 | 137891 | 137892 | 137893 | 137894 | 137895 | 137896 | 137897 | 137907 | 137917 | 137918 | 137919 | 137927 | 137928 | 137929 | 137930 | 137931 | 137932 | 137933 | 137962 | 137963 | 137964 | 137965 | 137966 | 137967 | 138019 | 138023 | 138024 | 138025 | 138026 | 138212

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.