diff options
Diffstat (limited to 'src/usr.bin/nc/netcat.c')
-rw-r--r-- | src/usr.bin/nc/netcat.c | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/src/usr.bin/nc/netcat.c b/src/usr.bin/nc/netcat.c index bbd8de0522..acb97870a0 100644 --- a/src/usr.bin/nc/netcat.c +++ b/src/usr.bin/nc/netcat.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: netcat.c,v 1.134 2015/09/11 21:22:54 deraadt Exp $ */ | 1 | /* $OpenBSD: netcat.c,v 1.135 2015/09/12 07:56:56 jmc Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> | 3 | * Copyright (c) 2001 Eric Jackson <ericj@monkey.org> |
4 | * Copyright (c) 2015 Bob Beck. All rights reserved. | 4 | * Copyright (c) 2015 Bob Beck. All rights reserved. |
@@ -1499,12 +1499,17 @@ help(void) | |||
1499 | fprintf(stderr, "\tCommand Summary:\n\ | 1499 | fprintf(stderr, "\tCommand Summary:\n\ |
1500 | \t-4 Use IPv4\n\ | 1500 | \t-4 Use IPv4\n\ |
1501 | \t-6 Use IPv6\n\ | 1501 | \t-6 Use IPv6\n\ |
1502 | \t-C certfile Public key file\n\ | ||
1503 | \t-c Use TLS\n\ | ||
1502 | \t-D Enable the debug socket option\n\ | 1504 | \t-D Enable the debug socket option\n\ |
1503 | \t-d Detach from stdin\n\ | 1505 | \t-d Detach from stdin\n\ |
1506 | \t-e name\t Required name in peer certificate\n\ | ||
1504 | \t-F Pass socket fd\n\ | 1507 | \t-F Pass socket fd\n\ |
1508 | \t-H hash\t Hash string of peer certificate\n\ | ||
1505 | \t-h This help text\n\ | 1509 | \t-h This help text\n\ |
1506 | \t-I length TCP receive buffer length\n\ | 1510 | \t-I length TCP receive buffer length\n\ |
1507 | \t-i secs\t Delay interval for lines sent, ports scanned\n\ | 1511 | \t-i interval Delay interval for lines sent, ports scanned\n\ |
1512 | \t-K keyfile Private key file\n\ | ||
1508 | \t-k Keep inbound sockets open for multiple connects\n\ | 1513 | \t-k Keep inbound sockets open for multiple connects\n\ |
1509 | \t-l Listen mode, for inbound connects\n\ | 1514 | \t-l Listen mode, for inbound connects\n\ |
1510 | \t-N Shutdown the network socket after EOF on stdin\n\ | 1515 | \t-N Shutdown the network socket after EOF on stdin\n\ |
@@ -1512,16 +1517,17 @@ help(void) | |||
1512 | \t-O length TCP send buffer length\n\ | 1517 | \t-O length TCP send buffer length\n\ |
1513 | \t-P proxyuser\tUsername for proxy authentication\n\ | 1518 | \t-P proxyuser\tUsername for proxy authentication\n\ |
1514 | \t-p port\t Specify local port for remote connects\n\ | 1519 | \t-p port\t Specify local port for remote connects\n\ |
1520 | \t-R CAfile CA bundle\n\ | ||
1515 | \t-r Randomize remote ports\n\ | 1521 | \t-r Randomize remote ports\n\ |
1516 | \t-S Enable the TCP MD5 signature option\n\ | 1522 | \t-S Enable the TCP MD5 signature option\n\ |
1517 | \t-s addr\t Local source address\n\ | 1523 | \t-s source Local source address\n\ |
1518 | \t-T toskeyword\tSet IP Type of Service\n\ | 1524 | \t-T keyword TOS value or TLS options\n\ |
1519 | \t-t Answer TELNET negotiation\n\ | 1525 | \t-t Answer TELNET negotiation\n\ |
1520 | \t-U Use UNIX domain socket\n\ | 1526 | \t-U Use UNIX domain socket\n\ |
1521 | \t-u UDP mode\n\ | 1527 | \t-u UDP mode\n\ |
1522 | \t-V rtable Specify alternate routing table\n\ | 1528 | \t-V rtable Specify alternate routing table\n\ |
1523 | \t-v Verbose\n\ | 1529 | \t-v Verbose\n\ |
1524 | \t-w secs\t Timeout for connects and final net reads\n\ | 1530 | \t-w timeout Timeout for connects and final net reads\n\ |
1525 | \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ | 1531 | \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ |
1526 | \t-x addr[:port]\tSpecify proxy address and port\n\ | 1532 | \t-x addr[:port]\tSpecify proxy address and port\n\ |
1527 | \t-z Zero-I/O mode [used for scanning]\n\ | 1533 | \t-z Zero-I/O mode [used for scanning]\n\ |
@@ -1533,11 +1539,12 @@ void | |||
1533 | usage(int ret) | 1539 | usage(int ret) |
1534 | { | 1540 | { |
1535 | fprintf(stderr, | 1541 | fprintf(stderr, |
1536 | "usage: nc [-46cDdFhklNnrStUuvz] [-C certfile] [-e name] \n" | 1542 | "usage: nc [-46cDdFhklNnrStUuvz] [-C certfile] [-e name] " |
1537 | "\t [-I length] [-i interval] [-H hash] [-K keyfile] [-O length]\n" | 1543 | "[-H hash] [-I length]\n" |
1538 | "\t [-P proxy_username] [-p source_port] [-R cafile] [-s source]\n" | 1544 | "\t [-i interval] [-K keyfile] [-O length] [-P proxy_username]\n" |
1539 | "\t [-T tls|toskeyword] [-V rtable] [-w timeout]\n" | 1545 | "\t [-p source_port] [-R CAfile] [-s source] " |
1540 | "\t [-X proxy_protocol] [-x proxy_address[:port]]\n" | 1546 | "[-T keyword] [-V rtable]\n" |
1547 | "\t [-w timeout] [-X proxy_protocol] [-x proxy_address[:port]]\n" | ||
1541 | "\t [destination] [port]\n"); | 1548 | "\t [destination] [port]\n"); |
1542 | if (ret) | 1549 | if (ret) |
1543 | exit(1); | 1550 | exit(1); |