diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | syslogd.c | 20 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 21 insertions, 7 deletions
@@ -1,4 +1,10 @@ --------------------------------------------------------------------------- +Version 1.13.1 (RGer), 2007-02-xx +- changed the listen backlog limit to a more reasonable value based on + the maximum number of TCP connections configurd (10% + 5) - thanks to Guy + Standen for the hint (actually, the limit was 5 and that was a + left-over from early testing). +--------------------------------------------------------------------------- Version 1.13.0 (RGer), 2006-12-19 - added '$' as ToPos proptery replacer specifier - means "up to the end of the string" @@ -1173,7 +1173,7 @@ static int create_tcp_socket(void) fd = socket(AF_INET, SOCK_STREAM, 0); if (fd < 0) { - logerror("syslog: TCP: Unknown protocol, suspending tcp inet service."); + logerror("syslog: TCP: could not create socket, suspending tcp inet service."); return fd; } @@ -1214,11 +1214,19 @@ static int create_tcp_socket(void) close(fd); return -1; } - - if(listen(fd, 5) < 0) { - logerror("listen, suspending tcp inet"); - close(fd); - return -1; + if(listen(fd, TCPSESS_MAX / 10 + 5) < 0) { + /* If the listen fails, it most probably fails because we ask + * for a too-large backlog. So in this case we first set back + * to a fixed, reasonable, limit that should work. Only if + * that fails, too, we give up. + */ + logerrorInt("listen with a backlog of %d failed - retrying with default of 32.", + TCPSESS_MAX / 10 + 5); + if(listen(fd, 32) < 0) { + logerror("listen, suspending tcp inet"); + close(fd); + return -1; + } } sockTCPLstn = fd; @@ -1,2 +1,2 @@ #define VERSION "1.13" -#define PATCHLEVEL "0" +#define PATCHLEVEL "1" |