From: Wayne Davison <wayned@samba.org>
Date: Tue, 4 Jan 2011 03:42:27 +0000 (-0800)
Subject: Added "listen backlog" daemon config paramater.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/050e5334d8eb98b3b851bdeb4e174d2afc53b795

Added "listen backlog" daemon config paramater.
---

diff --git a/loadparm.c b/loadparm.c
index 792c3dad..965b771b 100644
--- a/loadparm.c
+++ b/loadparm.c
@@ -97,6 +97,7 @@ typedef struct {
 	char *pid_file;
 	char *socket_options;
 
+	int listen_backlog;
 	int rsync_port;
 } global_vars;
 
@@ -175,6 +176,7 @@ static const all_vars Defaults = {
  /* pid_file; */		NULL,
  /* socket_options; */		NULL,
 
+ /* listen_backlog; */		5,
  /* rsync_port; */		0,
  },
 
@@ -311,6 +313,7 @@ static struct enum_list enum_facilities[] = {
 static struct parm_struct parm_table[] =
 {
  {"address",           P_STRING, P_GLOBAL,&Vars.g.bind_address,        NULL,0},
+ {"listen backlog",    P_INTEGER,P_GLOBAL,&Vars.g.listen_backlog,      NULL,0},
  {"motd file",         P_STRING, P_GLOBAL,&Vars.g.motd_file,           NULL,0},
  {"pid file",          P_STRING, P_GLOBAL,&Vars.g.pid_file,            NULL,0},
  {"port",              P_INTEGER,P_GLOBAL,&Vars.g.rsync_port,          NULL,0},
@@ -445,6 +448,7 @@ FN_GLOBAL_STRING(lp_motd_file, &Vars.g.motd_file)
 FN_GLOBAL_STRING(lp_pid_file, &Vars.g.pid_file)
 FN_GLOBAL_STRING(lp_socket_options, &Vars.g.socket_options)
 
+FN_GLOBAL_INTEGER(lp_listen_backlog, &Vars.g.listen_backlog)
 FN_GLOBAL_INTEGER(lp_rsync_port, &Vars.g.rsync_port)
 
 FN_LOCAL_STRING(lp_auth_users, auth_users)
diff --git a/rsyncd.conf.yo b/rsyncd.conf.yo
index 2dbf67c5..f7f483b5 100644
--- a/rsyncd.conf.yo
+++ b/rsyncd.conf.yo
@@ -120,6 +120,9 @@ details on some of the options you may be able to set. By default no
 special socket options are set.  These settings can also be specified
 via the bf(--sockopts) command-line option.
 
+dit(bf(listen backlog)) You can override the default backlog value when the
+daemon listens for connections.  It defaults to 5.
+
 enddit()
 
 manpagesection(MODULE PARAMETERS)
diff --git a/socket.c b/socket.c
index 81629743..c19412d2 100644
--- a/socket.c
+++ b/socket.c
@@ -546,7 +546,7 @@ void start_accept_loop(int port, int (*fn)(int, int))
 	/* ready to listen */
 	FD_ZERO(&deffds);
 	for (i = 0, maxfd = -1; sp[i] >= 0; i++) {
-		if (listen(sp[i], 5) < 0) {
+		if (listen(sp[i], lp_listen_backlog()) < 0) {
 			rsyserr(FERROR, errno, "listen() on socket failed");
 #ifdef INET6
 			if (errno == EADDRINUSE && i > 0) {