From: Michael Poole <mdpoole@troilus.org>
Date: Fri, 8 Jan 2010 03:01:26 +0000 (-0500)
Subject: Fix the time we set of SO_REUSEADDR for listening sockets.
X-Git-Url: http://git.pk910.de/?p=srvx.git;a=commitdiff_plain;h=1470cbd8d0457a053f4e42b02c302a296a61ed83

Fix the time we set of SO_REUSEADDR for listening sockets.

src/ioset.c (ioset_listen): Linux -- reasonably -- requires that
    SO_REUSEADDR be set on a socket before binding it to an in-use socket.
    So do that.
---

diff --git a/src/ioset.c b/src/ioset.c
index 30eb359..a7563d3 100644
--- a/src/ioset.c
+++ b/src/ioset.c
@@ -220,18 +220,18 @@ struct io_fd *ioset_listen(struct sockaddr *local, unsigned int sa_size, void *d
     }
 
     if (local && sa_size) {
+        opt = 1;
+        res = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
+        if (res < 0) {
+            log_module(MAIN_LOG, LOG_WARNING, "Unable to mark listener address as re-usable: %s", strerror(errno));
+        }
+
         res = bind(fd, local, sa_size);
         if (res < 0) {
             log_module(MAIN_LOG, LOG_ERROR, "Unable to bind listening socket %d: %s", fd, strerror(errno));
             close(fd);
             return NULL;
         }
-
-        opt = 1;
-        res = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (const char*)&opt, sizeof(opt));
-        if (res < 0) {
-            log_module(MAIN_LOG, LOG_WARNING, "Unable to mark listener address as re-usable: %s", strerror(errno));
-        }
     }
 
     res = listen(fd, 1);