reuseaddr02.patch 1.7 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From d365dd8141e709222f3a619d7b04ec4ded6429fd Mon Sep 17 00:00:00 2001
  2. From: Havoc Pennington <hp@pobox.com>
  3. Date: Tue, 31 Aug 2010 15:59:09 +0000
  4. Subject: Change failure of setsockopt SO_REUSEADDR to be a warning, not set an error
  5. It was previously setting an error but then continuing, which is
  6. not allowed since errors can't be "piled up"
  7. ---
  8. diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
  9. index e4ff6ee..3205bed 100644
  10. --- a/dbus/dbus-sysdeps-unix.c
  11. +++ b/dbus/dbus-sysdeps-unix.c
  12. @@ -980,9 +980,8 @@ _dbus_listen_unix_socket (const char *path,
  13. reuseaddr = 1;
  14. if (setsockopt (listen_fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
  15. {
  16. - dbus_set_error (error, _dbus_error_from_errno (errno),
  17. - "Failed to set socket option\"%s\": %s",
  18. - path, _dbus_strerror (errno));
  19. + _dbus_warn ("Failed to set socket option\"%s\": %s",
  20. + path, _dbus_strerror (errno));
  21. }
  22. if (bind (listen_fd, (struct sockaddr*) &addr, _DBUS_STRUCT_OFFSET (struct sockaddr_un, sun_path) + path_len) < 0)
  23. @@ -1335,9 +1334,8 @@ _dbus_listen_tcp_socket (const char *host,
  24. reuseaddr = 1;
  25. if (setsockopt (fd, SOL_SOCKET, SO_REUSEADDR, &reuseaddr, sizeof(reuseaddr))==-1)
  26. {
  27. - dbus_set_error (error, _dbus_error_from_errno (errno),
  28. - "Failed to set socket option \"%s:%s\": %s",
  29. - host ? host : "*", port, _dbus_strerror (errno));
  30. + _dbus_warn ("Failed to set socket option \"%s:%s\": %s",
  31. + host ? host : "*", port, _dbus_strerror (errno));
  32. }
  33. if (bind (fd, (struct sockaddr*) tmp->ai_addr, tmp->ai_addrlen) < 0)
  34. --
  35. cgit v0.8.3-6-g21f6