diff options
| author | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-04-18 12:10:55 +0000 |
|---|---|---|
| committer | Claudio Jeker <claudio@cvs.openbsd.org> | 2018-04-18 12:10:55 +0000 |
| commit | 4a3fb818a7fa4af63ab348f92aabea9495895650 (patch) | |
| tree | 90f61caa5c48eac6c306ee455458cf1a7e8adf89 /usr.sbin/relayd/relay.c | |
| parent | 6862b05c0d9851243d727fa0edfa95a0781e29d5 (diff) | |
Remove RELAY_MAX_SESSIONS from relayd, there is no reason to limit relays
to 1024 session per process (esp. with keep-alive). Now the fd limit is
the new maximum and relayd will make sure to not accept too many sessions.
The tcp backlog config maximum is now 512, adjust manpage accordingly.
OK benno@ deraadt@
Diffstat (limited to 'usr.sbin/relayd/relay.c')
| -rw-r--r-- | usr.sbin/relayd/relay.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.sbin/relayd/relay.c b/usr.sbin/relayd/relay.c index 510d867c162..bc2bdd1582e 100644 --- a/usr.sbin/relayd/relay.c +++ b/usr.sbin/relayd/relay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: relay.c,v 1.237 2017/12/27 15:53:30 benno Exp $ */ +/* $OpenBSD: relay.c,v 1.238 2018/04/18 12:10:54 claudio Exp $ */ /* * Copyright (c) 2006 - 2014 Reyk Floeter <reyk@openbsd.org> @@ -1077,8 +1077,7 @@ relay_accept(int fd, short event, void *arg) } return; } - if (relay_sessions >= RELAY_MAX_SESSIONS || - rlay->rl_conf.flags & F_DISABLE) + if (rlay->rl_conf.flags & F_DISABLE) goto err; if ((con = calloc(1, sizeof(*con))) == NULL) |