Attachment 62932 Details for Bug 50962 – second version of the patch, including error handling

[patch] second version of the patch, including error handling

dbus-systemd-address-v2.patch (text/plain), 5.13 KB, created by Simon Peeters on 2012-06-12 06:23:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Peeters

Created: 2012-06-12 06:23:07 UTC

Size: 5.13 KB

patch

obsolete

>diff -uNr dbus-1.6.0/dbus/dbus-server-unix.c dbus-1.6.0-2/dbus/dbus-server-unix.c
>--- dbus-1.6.0/dbus/dbus-server-unix.c	2012-03-28 19:43:32.000000000 +0200
>+++ dbus-1.6.0-2/dbus/dbus-server-unix.c	2012-06-12 14:34:29.327905841 +0200
>@@ -149,7 +149,7 @@
>     }
>   else if (strcmp (method, "systemd") == 0)
>     {
>-      int n, *fds;
>+      int i, n, *fds;
>       DBusString address;
> 
>       n = _dbus_listen_systemd_sockets (&fds, error);
>@@ -159,27 +159,39 @@
>           return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>         }
> 
>-      _dbus_string_init_const (&address, "systemd:");
>+      if(!_dbus_string_init(&address))
>+          goto oom;
> 
>-      *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
>-      if (*server_p == NULL)
>+      for (i = 0; i < n; i++)
>         {
>-          int i;
>-
>-          for (i = 0; i < n; i++)
>+          if ( i > 0)
>             {
>-              _dbus_close_socket (fds[i], NULL);
>+              if(!_dbus_string_append (&address, ";"))
>+                goto oom;
>             }
>-          dbus_free (fds);
>-
>-          dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>-          return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+          if(!_dbus_append_address_from_socket (fds[i], &address))
>+            goto oom;
>         }
> 
>+      *server_p = _dbus_server_new_for_socket (fds, n, &address, NULL);
>+      if (*server_p == NULL)
>+        goto oom;
>+
>       dbus_free (fds);
> 
>       return DBUS_SERVER_LISTEN_OK;
>-	}
>+  oom:
>+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>+      for (i = 0; i < n; i++)
>+        {
>+          _dbus_close_socket (fds[i], NULL);
>+        }
>+      dbus_free (fds);
>+      _dbus_string_free (&address);
>+
>+      dbus_set_error (error, DBUS_ERROR_NO_MEMORY, NULL);
>+      return DBUS_SERVER_LISTEN_DID_NOT_CONNECT;
>+    }
> #ifdef DBUS_ENABLE_LAUNCHD
>   else if (strcmp (method, "launchd") == 0)
>     {
>diff -uNr dbus-1.6.0/dbus/dbus-sysdeps-unix.c dbus-1.6.0-2/dbus/dbus-sysdeps-unix.c
>--- dbus-1.6.0/dbus/dbus-sysdeps-unix.c	2012-06-05 13:17:45.000000000 +0200
>+++ dbus-1.6.0-2/dbus/dbus-sysdeps-unix.c	2012-06-12 14:31:59.311781300 +0200
>@@ -4086,4 +4086,67 @@
>     close (i);
> }
> 
>+/**
>+ * Read the addres from the socket and append it to the string
>+ *
>+ * @param fd the socket
>+ * @param address
>+ */
>+dbus_bool_t _dbus_append_address_from_socket (int fd, DBusString *address)
>+{
>+  struct sockaddr_storage socket;
>+  struct sockaddr_in *inet_addr = (struct sockaddr_in*)&socket;
>+  struct sockaddr_in6 *inet6_addr = (struct sockaddr_in6*)&socket;
>+  struct sockaddr_un *unix_addr = (struct sockaddr_un*)&socket;
>+  char host[71];
>+  int size = sizeof(struct sockaddr_storage);
>+
>+  getsockname(fd, (struct sockaddr*)&socket, &size);
>+
>+  switch(socket.ss_family)
>+    {
>+    case AF_UNIX:
>+      if (unix_addr->sun_path[0]=='\0')
>+        {
>+          if (!_dbus_string_append (address, "unix:abstract=") ||
>+              !_dbus_string_append (address, &(unix_addr->sun_path[1])))
>+            return FALSE;
>+        }
>+      else
>+        {
>+          if (!_dbus_string_append (address, "unix:path=") ||
>+              !_dbus_string_append (address, unix_addr->sun_path))
>+            return FALSE;
>+        }
>+      break;
>+    case AF_INET:
>+      snprintf(host, 47, "tcp:family=ipv4,host=%hu.%hu.%hu.%hu,port=%hu",
>+               (inet_addr->sin_addr.s_addr & 0xFF000000)>>24,
>+               (inet_addr->sin_addr.s_addr & 0x00FF0000)>>16,
>+               (inet_addr->sin_addr.s_addr & 0x0000FF00)>>8,
>+               (inet_addr->sin_addr.s_addr & 0x000000FF),
>+               inet_addr->sin_port);
>+      if(!_dbus_string_append (address, host))
>+        return FALSE;
>+    case AF_INET6:
>+      snprintf(host, 71, "tcp:family=ipv6,host=%.2hhx%.2hhx:%.2hhx%.2hhx:%.2hhx%.2hhx:%.2hhx%.2hhx:"
>+                         "%.2hhx%.2hhx:%.2hhx%.2hhx:%.2hhx%.2hhx:%.2hhx%.2hhx,port=%hu",
>+               inet6_addr->sin6_addr.s6_addr[0], inet6_addr->sin6_addr.s6_addr[1],
>+               inet6_addr->sin6_addr.s6_addr[2], inet6_addr->sin6_addr.s6_addr[3],
>+               inet6_addr->sin6_addr.s6_addr[4], inet6_addr->sin6_addr.s6_addr[5],
>+               inet6_addr->sin6_addr.s6_addr[6], inet6_addr->sin6_addr.s6_addr[7],
>+               inet6_addr->sin6_addr.s6_addr[8], inet6_addr->sin6_addr.s6_addr[9],
>+               inet6_addr->sin6_addr.s6_addr[10], inet6_addr->sin6_addr.s6_addr[11],
>+               inet6_addr->sin6_addr.s6_addr[12], inet6_addr->sin6_addr.s6_addr[13],
>+               inet6_addr->sin6_addr.s6_addr[14], inet6_addr->sin6_addr.s6_addr[15],
>+               inet6_addr->sin6_port);
>+      if(!_dbus_string_append (address, host))
>+        return FALSE;
>+      break;
>+    default:
>+      return FALSE;
>+    }
>+  return TRUE;
>+}
>+
> /* tests in dbus-sysdeps-util.c */
>diff -uNr dbus-1.6.0/dbus/dbus-sysdeps-unix.h dbus-1.6.0-2/dbus/dbus-sysdeps-unix.h
>--- dbus-1.6.0/dbus/dbus-sysdeps-unix.h	2012-06-05 13:17:45.000000000 +0200
>+++ dbus-1.6.0-2/dbus/dbus-sysdeps-unix.h	2012-06-12 14:23:28.748164224 +0200
>@@ -138,6 +138,8 @@
> 
> void _dbus_close_all (void);
> 
>+dbus_bool_t _dbus_append_address_from_socket (int fd, DBusString *address);
>+
> /** @} */
> 
> DBUS_END_DECLS
>Binary files dbus-1.6.0/.swp and dbus-1.6.0-2/.swp differ

Actions: View | Splinter Review

Attachments on bug 50962: 62899 | 62932 | 62992 | 65321 | 68211

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.