diff options
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.8 | 7 | ||||
| -rw-r--r-- | usr.sbin/ftp-proxy/ftp-proxy.c | 22 |
2 files changed, 16 insertions, 13 deletions
diff --git a/usr.sbin/ftp-proxy/ftp-proxy.8 b/usr.sbin/ftp-proxy/ftp-proxy.8 index c9bb9c54125..44e6e59d22f 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.8 +++ b/usr.sbin/ftp-proxy/ftp-proxy.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ftp-proxy.8,v 1.6 2006/10/23 07:05:49 jmc Exp $ +.\" $OpenBSD: ftp-proxy.8,v 1.7 2006/12/30 13:01:54 camield Exp $ .\" .\" Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> .\" @@ -105,7 +105,8 @@ The process will stay in the foreground, logging to standard error. .It Fl m Ar maxsessions Maximum number of concurrent FTP sessions. When the proxy reaches this limit, new connections are denied. -The default is 100. +The default is 100 sessions. +The limit can be lowered to a minimum of 1, or raised to a maximum of 500. .It Fl P Ar port Fixed server port. Only used in combination with @@ -130,7 +131,7 @@ on this RFC property. .It Fl t Ar timeout Number of seconds that the control connection can be idle, before the proxy will disconnect. -The default is 24 hours. +The maximum is 86400 seconds, which is also the default. Do not set this too low, because the control connection is usually idle when large data transfers are taking place. .It Fl v diff --git a/usr.sbin/ftp-proxy/ftp-proxy.c b/usr.sbin/ftp-proxy/ftp-proxy.c index 7d2e0a79c93..34f73c1880a 100644 --- a/usr.sbin/ftp-proxy/ftp-proxy.c +++ b/usr.sbin/ftp-proxy/ftp-proxy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ftp-proxy.c,v 1.11 2006/12/12 07:28:41 camield Exp $ */ +/* $OpenBSD: ftp-proxy.c,v 1.12 2006/12/30 13:01:54 camield Exp $ */ /* * Copyright (c) 2004, 2005 Camiel Dobbelaar, <cd@sentia.nl> @@ -581,6 +581,7 @@ main(int argc, char *argv[]) struct addrinfo hints, *res; struct event ev, ev_sighup, ev_sigint, ev_sigterm; int ch, error, listenfd, on; + const char *errstr; /* Defaults. */ anonymous_only = 0; @@ -617,17 +618,18 @@ main(int argc, char *argv[]) listen_ip = optarg; break; case 'D': - loglevel = atoi(optarg); - if (loglevel < LOG_EMERG || loglevel > LOG_DEBUG) - errx(1, "bad loglevel"); + loglevel = strtonum(optarg, LOG_EMERG, LOG_DEBUG, + &errstr); + if (errstr) + errx(1, "loglevel %s", errstr); break; case 'd': daemonize = 0; break; case 'm': - max_sessions = atoi(optarg); - if (max_sessions < 0) - errx(1, "bad max sessions"); + max_sessions = strtonum(optarg, 1, 500, &errstr); + if (errstr) + errx(1, "max sessions %s", errstr); break; case 'P': fixed_server_port = optarg; @@ -647,9 +649,9 @@ main(int argc, char *argv[]) rfc_mode = 1; break; case 't': - timeout = atoi(optarg); - if (timeout < 0) - errx(1, "bad timeout"); + timeout = strtonum(optarg, 0, 86400, &errstr); + if (errstr) + errx(1, "timeout %s", errstr); break; case 'v': verbose++; |