Attachment 38332 Details for Bug 28838 – 0001-sysdeps-unix-enable-address-reuse-on-TCP-sockets.patch v2

[patch] 0001-sysdeps-unix-enable-address-reuse-on-TCP-sockets.patch v2

0001-sysdeps-unix-enable-address-reuse-on-TCP-sockets.patch (text/plain), 2.20 KB, created by Steffen Sledz on 2010-08-31 06:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steffen Sledz

Created: 2010-08-31 06:20:00 UTC

Size: 2.20 KB

patch

obsolete

>From 69820b50899fdfbe681818d0c306cb778ef77a56 Mon Sep 17 00:00:00 2001
>From: Sledz <sledz@MOBIL-400-586.intern.dresearch.de>
>Date: Tue, 29 Jun 2010 23:04:15 +0200
>Subject: [PATCH v2] sysdeps-unix: enable address reuse on TCP sockets
>
>This helps to avoid 'Address already in use' problems if server has been shut
>down, and then restarted while sockets are still active on its port.
>
>Signed-off-by: Steffen Sledz <sledz@dresearch.de>
>---
> dbus/dbus-sysdeps-unix.c |   18 +++++++++++++++++-
> 1 files changed, 17 insertions(+), 1 deletions(-)
>
>diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
>index ce3475a..98d344b 100644
>--- a/dbus/dbus-sysdeps-unix.c
>+++ b/dbus/dbus-sysdeps-unix.c
>@@ -623,6 +623,7 @@ _dbus_listen_unix_socket (const char     *path,
>   int listen_fd;
>   struct sockaddr_un addr;
>   size_t path_len;
>+  unsigned int reuseaddr;
> 
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
> 
>@@ -696,7 +697,14 @@ _dbus_listen_unix_socket (const char     *path,
> 	
>       strncpy (addr.sun_path, path, path_len);
>     }
>-  
>+
>+  reuseaddr = 1;
>+  if (setsockopt  (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
>+    {
>+      _dbus_warn ("Failed to set socket option\"%s\": %s",
>+                  path, _dbus_strerror (errno));
>+    }
>+
>   if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0)
>     {
>       dbus_set_error (error, _dbus_error_from_errno (errno),
>@@ -870,6 +878,7 @@ _dbus_listen_tcp_socket (const char     *host,
>   int nlisten_fd = 0, *listen_fd = NULL, res, i;
>   struct addrinfo hints;
>   struct addrinfo *ai, *tmp;
>+  unsigned int reuseaddr;
> 
>   *fds_p = NULL;
>   _DBUS_ASSERT_ERROR_IS_CLEAR (error);
>@@ -915,6 +924,13 @@ _dbus_listen_tcp_socket (const char     *host,
>         }
>       _DBUS_ASSERT_ERROR_IS_CLEAR(error);
> 
>+      reuseaddr = 1;
>+      if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
>+        {
>+          _dbus_warn ("Failed to set socket option \"%s:%s\": %s",
>+                      host ? host : "*", port, _dbus_strerror (errno));
>+        }
>+
>       if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
>         {
>           _dbus_close(fd, NULL);
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28838: 36620 | 38332 | 38333 | 38334

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.