From: Junio C Hamano Date: Sat, 04 Feb 2006 08:49:47 GMT Subject: Re: [PATCH 2/3] daemon: Set SO_REUSEADDR on listening sockets. Message-ID: <7vfymz33v8.fsf@assigned-by-dhcp.cox.net> In-Reply-To: <20060203202704.1895.18383.stgit@metalzone.distorted.org.uk> Mark Wooding writes: > From: Mark Wooding > > Without this, you can silently lose the ability to receive IPv4 > connections if you stop and restart the daemon. > > Signed-off-by: Mark Wooding But with that, you expose yourself to the confusion TIME_WAIT was designed to protect you from, so how about making it optional like this? Tested, of course ;-). -- >8 -- From nobody Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri Feb 3 20:27:04 2006 +0000 Subject: [PATCH] daemon: Set SO_REUSEADDR on listening sockets. Without this, you can silently lose the ability to receive IPv4 connections if you stop and restart the daemon. [jc: tweaked code organization a bit and made this controllable from a command line option.] Signed-off-by: Mark Wooding Signed-off-by: Junio C Hamano --- daemon.c | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-) bb1527c884bbb9bf6a5d06c1dd409ea6c2045a91 diff --git a/daemon.c b/daemon.c index 324bb04..dab8c2c 100644 --- a/daemon.c +++ b/daemon.c @@ -13,11 +13,12 @@ static int log_syslog; static int verbose; +static int reuseaddr; static const char daemon_usage[] = "git-daemon [--verbose] [--syslog] [--inetd | --port=n] [--export-all]\n" " [--timeout=n] [--init-timeout=n] [--strict-paths]\n" -" [--base-path=path] [directory...]"; +" [--base-path=path] [--reuseaddr] [directory...]"; /* List of acceptable pathname prefixes */ static char **ok_paths = NULL; @@ -451,6 +452,16 @@ static void child_handler(int signo) } } +static int set_reuse_addr(int sockfd) +{ + int on = 1; + + if (!reuseaddr) + return 0; + return setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, + &on, sizeof(on)); +} + #ifndef NO_IPV6 static int socksetup(int port, int **socklist_p) @@ -495,6 +506,11 @@ static int socksetup(int port, int **soc } #endif + if (set_reuse_addr(sockfd)) { + close(sockfd); + return 0; /* not fatal */ + } + if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { close(sockfd); continue; /* not fatal */ @@ -537,6 +553,11 @@ static int socksetup(int port, int **soc sin.sin_addr.s_addr = htonl(INADDR_ANY); sin.sin_port = htons(port); + if (set_reuse_addr(sockfd)) { + close(sockfd); + return 0; + } + if ( bind(sockfd, (struct sockaddr *)&sin, sizeof sin) < 0 ) { close(sockfd); return 0; @@ -663,6 +684,10 @@ int main(int argc, char **argv) base_path = arg+12; continue; } + if (!strcmp(arg, "--reuseaddr")) { + reuseaddr = 1; + continue; + } if (!strcmp(arg, "--")) { ok_paths = &argv[i+1]; break; -- 1.1.6.gf7ef