aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2008-09-27 02:29:03 +0000
committerXin LI <delphij@FreeBSD.org>2008-09-27 02:29:03 +0000
commitf646fedc0a4d919451a7322a57701d141f8b5178 (patch)
tree95f5fa5f0cd15146151097c69b10c33779880c12
parentd70de3898cce804fdd0c736b4d8eadef2f7b0249 (diff)
downloadsrc-f646fedc0a4d919451a7322a57701d141f8b5178.tar.gz
src-f646fedc0a4d919451a7322a57701d141f8b5178.zip
Vendor import of netcat from OPENBSD_4_4vendor/netcat/4.4
Obtained from: OpenBSD MFC after: 7.1-RELEASE
Notes
Notes: svn path=/vendor/netcat/dist/; revision=183396 svn path=/vendor/netcat/4.4/; revision=193004; tag=vendor/netcat/4.4
-rw-r--r--Makefile6
-rw-r--r--nc.110
-rw-r--r--netcat.c37
3 files changed, 47 insertions, 6 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 000000000000..150f8295bde0
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+# $OpenBSD: Makefile,v 1.6 2001/09/02 18:45:41 jakob Exp $
+
+PROG= nc
+SRCS= netcat.c atomicio.c socks.c
+
+.include <bsd.prog.mk>
diff --git a/nc.1 b/nc.1
index daa521cf554b..75410e298d65 100644
--- a/nc.1
+++ b/nc.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.47 2008/05/06 16:21:03 jmc Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,7 +25,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd $Mdocdate$
+.Dd $Mdocdate: May 6 2008 $
.Dt NC 1
.Os
.Sh NAME
@@ -35,7 +35,9 @@
.Nm nc
.Bk -words
.Op Fl 46DdhklnrStUuvz
+.Op Fl I Ar length
.Op Fl i Ar interval
+.Op Fl O Ar length
.Op Fl P Ar proxy_username
.Op Fl p Ar source_port
.Op Fl s Ar source_ip_address
@@ -101,6 +103,8 @@ Do not attempt to read from stdin.
Prints out
.Nm
help.
+.It Fl I Ar length
+Specifies the size of the TCP receive buffer.
.It Fl i Ar interval
Specifies a delay time interval between lines of text sent and received.
Also causes a delay time between connections to multiple ports.
@@ -129,6 +133,8 @@ option are ignored.
.It Fl n
Do not do any DNS or service lookups on any specified addresses,
hostnames or ports.
+.It Fl O Ar length
+Specifies the size of the TCP send buffer.
.It Fl P Ar proxy_username
Specifies a username to present to a proxy server that requires authentication.
If no username is specified then authentication will not be attempted.
diff --git a/netcat.c b/netcat.c
index 1c671f2e75e0..48b2b673ba4f 100644
--- a/netcat.c
+++ b/netcat.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: netcat.c,v 1.89 2007/02/20 14:11:17 jmc Exp $ */
+/* $OpenBSD: netcat.c,v 1.91 2008/05/09 09:00:11 markus Exp $ */
/*
* Copyright (c) 2001 Eric Jackson <ericj@monkey.org>
*
@@ -80,6 +80,8 @@ int vflag; /* Verbosity */
int xflag; /* Socks proxy */
int zflag; /* Port Scan Flag */
int Dflag; /* sodebug */
+int Iflag; /* TCP receive buffer size */
+int Oflag; /* TCP send buffer size */
int Sflag; /* TCP MD5 signature option */
int Tflag = -1; /* IP Type of Service */
@@ -123,7 +125,7 @@ main(int argc, char *argv[])
sv = NULL;
while ((ch = getopt(argc, argv,
- "46Ddhi:jklnP:p:rSs:tT:Uuvw:X:x:z")) != -1) {
+ "46DdhI:i:jklnO:P:p:rSs:tT:Uuvw:X:x:z")) != -1) {
switch (ch) {
case '4':
family = AF_INET;
@@ -205,6 +207,18 @@ main(int argc, char *argv[])
case 'D':
Dflag = 1;
break;
+ case 'I':
+ Iflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+ if (errstr != NULL)
+ errx(1, "TCP receive window %s: %s",
+ errstr, optarg);
+ break;
+ case 'O':
+ Oflag = strtonum(optarg, 1, 65536 << 14, &errstr);
+ if (errstr != NULL)
+ errx(1, "TCP send window %s: %s",
+ errstr, optarg);
+ break;
case 'S':
Sflag = 1;
break;
@@ -473,7 +487,7 @@ int
remote_connect(const char *host, const char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
- int s, error;
+ int s, error, on = 1;
if ((error = getaddrinfo(host, port, &hints, &res)))
errx(1, "getaddrinfo: %s", gai_strerror(error));
@@ -488,6 +502,8 @@ remote_connect(const char *host, const char *port, struct addrinfo hints)
if (sflag || pflag) {
struct addrinfo ahints, *ares;
+ /* try SO_BINDANY, but don't insist */
+ setsockopt(s, SOL_SOCKET, SO_BINDANY, &on, sizeof(on));
memset(&ahints, 0, sizeof(struct addrinfo));
ahints.ai_family = res0->ai_family;
ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM;
@@ -781,6 +797,16 @@ set_common_sockopts(int s)
&Tflag, sizeof(Tflag)) == -1)
err(1, "set IP ToS");
}
+ if (Iflag) {
+ if (setsockopt(s, SOL_SOCKET, SO_RCVBUF,
+ &Iflag, sizeof(Iflag)) == -1)
+ err(1, "set TCP receive buffer size");
+ }
+ if (Oflag) {
+ if (setsockopt(s, SOL_SOCKET, SO_SNDBUF,
+ &Oflag, sizeof(Oflag)) == -1)
+ err(1, "set TCP send buffer size");
+ }
}
int
@@ -810,10 +836,12 @@ help(void)
\t-D Enable the debug socket option\n\
\t-d Detach from stdin\n\
\t-h This help text\n\
+ \t-I length TCP receive buffer length\n\
\t-i secs\t Delay interval for lines sent, ports scanned\n\
\t-k Keep inbound sockets open for multiple connects\n\
\t-l Listen mode, for inbound connects\n\
\t-n Suppress name/port resolutions\n\
+ \t-O length TCP send buffer length\n\
\t-P proxyuser\tUsername for proxy authentication\n\
\t-p port\t Specify local port for remote connects\n\
\t-r Randomize remote ports\n\
@@ -835,7 +863,8 @@ help(void)
void
usage(int ret)
{
- fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-i interval] [-P proxy_username] [-p source_port]\n");
+ fprintf(stderr, "usage: nc [-46DdhklnrStUuvz] [-I receive_buffer_len] [-i interval]\n");
+ fprintf(stderr, "\t [-O send_buffer_len] [-P proxy_username] [-p source_port]\n");
fprintf(stderr, "\t [-s source_ip_address] [-T ToS] [-w timeout] [-X proxy_protocol]\n");
fprintf(stderr, "\t [-x proxy_address[:port]] [hostname] [port[s]]\n");
if (ret)