diff options
Diffstat (limited to 'contrib/telnet/telnet/main.c')
| -rw-r--r-- | contrib/telnet/telnet/main.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/contrib/telnet/telnet/main.c b/contrib/telnet/telnet/main.c index ed5ee97b8334..f6eb1ffb08ef 100644 --- a/contrib/telnet/telnet/main.c +++ b/contrib/telnet/telnet/main.c @@ -39,7 +39,7 @@ static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #include <sys/cdefs.h> __FBSDID("$FreeBSD$"); -#include <sys/types.h> +#include <sys/param.h> #include <sys/socket.h> #include <stdlib.h> #include <string.h> @@ -66,6 +66,8 @@ char *ipsec_policy_in = NULL; char *ipsec_policy_out = NULL; #endif +extern int tos; + int family = AF_UNSPEC; /* @@ -115,8 +117,9 @@ usage(void) int main(int argc, char *argv[]) { + u_long ultmp; int ch; - char *user; + char *ep, *user; char *src_addr = NULL; #ifdef FORWARD extern int forward_flags; @@ -181,9 +184,7 @@ main(int argc, char *argv[]) doaddrlookup = 0; break; case 'S': - { #ifdef HAS_GETTOS - extern int tos; if ((tos = parsetos(optarg, "tcp")) < 0) fprintf(stderr, "%s%s%s%s\n", @@ -191,11 +192,16 @@ main(int argc, char *argv[]) optarg, "; will try to use default TOS"); #else - fprintf(stderr, - "%s: Warning: -S ignored, no parsetos() support.\n", - prompt); +#define MAXTOS 255 + ultmp = strtoul(optarg, &ep, 0); + if (*ep || ep == optarg || ultmp > MAXTOS) + fprintf(stderr, "%s%s%s%s\n", + prompt, ": Bad TOS argument '", + optarg, + "; will try to use default TOS"); + else + tos = ultmp; #endif - } break; case 'X': #ifdef AUTHENTICATION |