Attachment 137894 Details for Bug 61922 – [4/7] _dbus_listen_tcp_socket: Set more specific IP-related errors

[patch] [4/7] _dbus_listen_tcp_socket: Set more specific IP-related errors

0004-_dbus_listen_tcp_socket-Set-more-specific-IP-related.patch (text/plain), 3.73 KB, created by Simon McVittie on 2018-03-08 14:47:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2018-03-08 14:47:30 UTC

Size: 3.73 KB

patch

obsolete

>From 48484915dc60ac2f7cb65d809793b761c55e23c5 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Thu, 8 Mar 2018 13:36:17 +0000
>Subject: [PATCH 4/7] _dbus_listen_tcp_socket: Set more specific IP-related
> errors
>
>When we have resolved a hostname/port pair to a list of IPv4 or IPv6
>addresses, if we are unable to listen on a a specific one of those
>addresses, we should report which one.
>
>When IPv6 is disabled for the loopback interface, this changes the
>diagnostic from:
>
>Failed to bind socket "localhost:1234": Cannot assign requested address
>
>to the more informative
>
>Failed to bind socket "::1" port 1234: Cannot assign requested address
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> dbus/dbus-sysdeps-unix.c | 48 ++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 42 insertions(+), 6 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index 0eb5e86e..4ee239c6 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -1396,6 +1396,43 @@ inet_sockaddr_to_string (const void *sockaddr_pointer,
>     }
> }
> 
>+/*
>+ * Format an error appropriate for saved_errno for the IPv4 or IPv6
>+ * address pointed to by sockaddr_pointer of length sockaddr_len.
>+ *
>+ * @param error The error to set
>+ * @param sockaddr_pointer A struct sockaddr_in or struct sockaddr_in6
>+ * @param len The length of the struct pointed to by sockaddr_pointer
>+ * @param description A prefix like "Failed to listen on socket"
>+ * @param saved_errno The OS-level error number to use
>+ */
>+static void
>+set_error_with_inet_sockaddr (DBusError *error,
>+                              const void *sockaddr_pointer,
>+                              socklen_t len,
>+                              const char *description,
>+                              int saved_errno)
>+{
>+  char string[INET6_ADDRSTRLEN];
>+  dbus_uint16_t port;
>+  const struct sockaddr *addr = sockaddr_pointer;
>+
>+  if (inet_sockaddr_to_string (sockaddr_pointer, len, string, sizeof (string),
>+                               NULL, &port))
>+    {
>+      dbus_set_error (error, _dbus_error_from_errno (saved_errno),
>+                      "%s \"%s\" port %u: %s",
>+                      description, string, port, _dbus_strerror (saved_errno));
>+    }
>+  else
>+    {
>+      dbus_set_error (error, _dbus_error_from_errno (saved_errno),
>+                      "%s <address of unknown family %d>: %s",
>+                      description, addr->sa_family,
>+                      _dbus_strerror (saved_errno));
>+    }
>+}
>+
> /**
>  * Creates a socket and connects to a socket at the given host
>  * and port. The connection fd is returned, and is set up as
>@@ -1633,9 +1670,9 @@ _dbus_listen_tcp_socket (const char     *host,
>               tmp = tmp->ai_next;
>               continue;
>             }
>-          dbus_set_error (error, _dbus_error_from_errno (saved_errno),
>-                          "Failed to bind socket \"%s:%s\": %s",
>-                          host ? host : "*", port, _dbus_strerror (saved_errno));
>+
>+          set_error_with_inet_sockaddr (error, tmp->ai_addr, tmp->ai_addrlen,
>+                                        "Failed to bind socket", saved_errno);
>           goto failed;
>         }
> 
>@@ -1643,9 +1680,8 @@ _dbus_listen_tcp_socket (const char     *host,
>         {
>           saved_errno = errno;
>           _dbus_close (fd, NULL);
>-          dbus_set_error (error, _dbus_error_from_errno (saved_errno),
>-                          "Failed to listen on socket \"%s:%s\": %s",
>-                          host ? host : "*", port, _dbus_strerror (saved_errno));
>+          set_error_with_inet_sockaddr (error, tmp->ai_addr, tmp->ai_addrlen,
>+                                        "Failed to listen on socket", saved_errno);
>           goto failed;
>         }
> 
>-- 
>2.16.2
>

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.