diff options
| author | wollman <wollman@FreeBSD.org> | 1995-11-03 18:33:46 +0000 |
|---|---|---|
| committer | wollman <wollman@FreeBSD.org> | 1995-11-03 18:33:46 +0000 |
| commit | cfbb3f260a6c68348be1421a29b296eb59896606 (patch) | |
| tree | 9bcad223ed166dddfb10c012f5832a2ad4eb5c46 /sys | |
| parent | ef462b028ea95f68303bdd52aa38a6638945b105 (diff) | |
| download | FreeBSD-src-cfbb3f260a6c68348be1421a29b296eb59896606.zip FreeBSD-src-cfbb3f260a6c68348be1421a29b296eb59896606.tar.gz | |
Make somaxconn (maximum backlog in a listen(2) request) and sb_max
(maximum size of a socket buffer) tunable.
Permit callers of listen(2) to specify a negative backlog, which
is translated into somaxconn. Previously, a negative backlog was
silently translated into 0.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/uipc_sockbuf.c | 7 | ||||
| -rw-r--r-- | sys/kern/uipc_socket.c | 12 | ||||
| -rw-r--r-- | sys/kern/uipc_socket2.c | 7 |
3 files changed, 18 insertions, 8 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 3f7d082..807caad 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp $ + * $Id: uipc_socket2.c,v 1.5 1995/05/30 08:06:22 rgrimes Exp $ */ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/proc.h> #include <sys/file.h> #include <sys/buf.h> @@ -46,6 +47,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/signalvar.h> +#include <sys/sysctl.h> /* * Primitive routines for operating on sockets and socket buffers @@ -56,7 +58,8 @@ char netio[] = "netio"; char netcon[] = "netcon"; char netcls[] = "netcls"; -u_long sb_max = SB_MAX; /* patchable */ +u_long sb_max = SB_MAX; /* XXX should be static */ +SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "") /* * Procedures to manipulate state flags of socket diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 592cd59..fe6f1f0 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)uipc_socket.c 8.3 (Berkeley) 4/15/94 - * $Id: uipc_socket.c,v 1.10 1995/05/30 08:06:21 rgrimes Exp $ + * $Id: uipc_socket.c,v 1.11 1995/08/25 20:27:46 bde Exp $ */ #include <sys/param.h> @@ -47,6 +47,10 @@ #include <sys/socketvar.h> #include <sys/resourcevar.h> #include <sys/signalvar.h> +#include <sys/sysctl.h> + +static int somaxconn = SOMAXCONN; +SYSCTL_INT(_kern, KERN_SOMAXCONN, somaxconn, CTLFLAG_RW, &somaxconn, 0, ""); /* * Socket operation routines. @@ -125,9 +129,9 @@ solisten(so, backlog) } if (so->so_q == 0) so->so_options |= SO_ACCEPTCONN; - if (backlog < 0) - backlog = 0; - so->so_qlimit = min(backlog, SOMAXCONN); + if (backlog < 0 || backlog > somaxconn) + backlog = somaxconn; + so->so_qlimit = backlog; splx(s); return (0); } diff --git a/sys/kern/uipc_socket2.c b/sys/kern/uipc_socket2.c index 3f7d082..807caad 100644 --- a/sys/kern/uipc_socket2.c +++ b/sys/kern/uipc_socket2.c @@ -31,11 +31,12 @@ * SUCH DAMAGE. * * @(#)uipc_socket2.c 8.1 (Berkeley) 6/10/93 - * $Id: uipc_socket2.c,v 1.4 1994/10/02 17:35:33 phk Exp $ + * $Id: uipc_socket2.c,v 1.5 1995/05/30 08:06:22 rgrimes Exp $ */ #include <sys/param.h> #include <sys/systm.h> +#include <sys/kernel.h> #include <sys/proc.h> #include <sys/file.h> #include <sys/buf.h> @@ -46,6 +47,7 @@ #include <sys/socket.h> #include <sys/socketvar.h> #include <sys/signalvar.h> +#include <sys/sysctl.h> /* * Primitive routines for operating on sockets and socket buffers @@ -56,7 +58,8 @@ char netio[] = "netio"; char netcon[] = "netcon"; char netcls[] = "netcls"; -u_long sb_max = SB_MAX; /* patchable */ +u_long sb_max = SB_MAX; /* XXX should be static */ +SYSCTL_INT(_kern, KERN_MAXSOCKBUF, maxsockbuf, CTLFLAG_RW, &sb_max, 0, "") /* * Procedures to manipulate state flags of socket |
