diff options
Diffstat (limited to 'network/netcat-openbsd')
7 files changed, 1 insertions, 1082 deletions
diff --git a/network/netcat-openbsd/netcat-openbsd.SlackBuild b/network/netcat-openbsd/netcat-openbsd.SlackBuild index c842dbced4..22fa49b298 100644 --- a/network/netcat-openbsd/netcat-openbsd.SlackBuild +++ b/network/netcat-openbsd/netcat-openbsd.SlackBuild @@ -25,7 +25,7 @@ PRGNAM=netcat-openbsd VERSION=${VERSION:-1.206} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} DEBVER=1 diff --git a/network/netcat-openbsd/patches/0002-connect-timeout.patch b/network/netcat-openbsd/patches/0002-connect-timeout.patch deleted file mode 100644 index 30d1d550e1..0000000000 --- a/network/netcat-openbsd/patches/0002-connect-timeout.patch +++ /dev/null @@ -1,121 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 14:43:56 +0800 -Subject: connect timeout - ---- - netcat.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 file changed, 75 insertions(+), 2 deletions(-) - -diff --git a/netcat.c b/netcat.c -index 9b2def2..f3cc8c1 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -106,6 +106,10 @@ - #define PORT_MAX_LEN 6 - #define UNIX_DG_TMP_SOCKET_SIZE 19 - -+#define CONNECTION_SUCCESS 0 -+#define CONNECTION_FAILED 1 -+#define CONNECTION_TIMEOUT 2 -+ - /* Command Line Options */ - int dflag; /* detached, no stdin */ - unsigned int iflag; /* Interval Flag */ -@@ -151,6 +155,9 @@ void set_common_sockopts(int); - int map_tos(char *, int *); - void usage(int); - -+static int connect_with_timeout(int fd, const struct sockaddr *sa, -+ socklen_t salen, int ctimeout); -+ - int - main(int argc, char *argv[]) - { -@@ -651,11 +658,14 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - - set_common_sockopts(s); - -- if (timeout_connect(s, res0->ai_addr, res0->ai_addrlen) == 0) -+ if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) - break; -- else if (vflag) -+ else if (vflag && error == CONNECTION_FAILED) - warn("connect to %s port %s (%s) failed", host, port, - uflag ? "udp" : "tcp"); -+ else if (vflag && error == CONNECTION_TIMEOUT) -+ warn("connect to %s port %s (%s) timed out", host, port, -+ uflag ? "udp" : "tcp"); - - close(s); - s = -1; -@@ -703,6 +713,69 @@ timeout_connect(int s, const struct sockaddr *name, socklen_t namelen) - return (ret); - } - -+static int connect_with_timeout(int fd, const struct sockaddr *sa, -+ socklen_t salen, int ctimeout) -+{ -+ int err; -+ struct timeval tv, *tvp = NULL; -+ fd_set connect_fdset; -+ socklen_t len; -+ int orig_flags; -+ -+ orig_flags = fcntl(fd, F_GETFL, 0); -+ if (fcntl(fd, F_SETFL, orig_flags | O_NONBLOCK) < 0 ) { -+ warn("can't set O_NONBLOCK - timeout not available"); -+ if (connect(fd, sa, salen) == 0) -+ return CONNECTION_SUCCESS; -+ else -+ return CONNECTION_FAILED; -+ } -+ -+ /* set connect timeout */ -+ if (ctimeout > 0) { -+ tv.tv_sec = (time_t)ctimeout/1000; -+ tv.tv_usec = 0; -+ tvp = &tv; -+ } -+ -+ /* attempt the connection */ -+ err = connect(fd, sa, salen); -+ if (err != 0 && errno == EINPROGRESS) { -+ /* connection is proceeding -+ * it is complete (or failed) when select returns */ -+ -+ /* initialize connect_fdset */ -+ FD_ZERO(&connect_fdset); -+ FD_SET(fd, &connect_fdset); -+ -+ /* call select */ -+ do { -+ err = select(fd + 1, NULL, &connect_fdset, -+ NULL, tvp); -+ } while (err < 0 && errno == EINTR); -+ -+ /* select error */ -+ if (err < 0) -+ errx(1,"select error: %s", strerror(errno)); -+ /* we have reached a timeout */ -+ if (err == 0) -+ return CONNECTION_TIMEOUT; -+ /* select returned successfully, but we must test socket -+ * error for result */ -+ len = sizeof(err); -+ if (getsockopt(fd, SOL_SOCKET, SO_ERROR, &err, &len) < 0) -+ errx(1, "getsockopt error: %s", strerror(errno)); -+ /* setup errno according to the result returned by -+ * getsockopt */ -+ if (err != 0) -+ errno = err; -+ } -+ -+ /* return aborted if an error occured, and valid otherwise */ -+ fcntl(fd, F_SETFL, orig_flags); -+ return (err != 0)? CONNECTION_FAILED : CONNECTION_SUCCESS; -+} -+ - /* - * local_listen() - * Returns a socket listening on a local port, binds to specified source --- diff --git a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch b/network/netcat-openbsd/patches/0003-get-sev-by-name.patch deleted file mode 100644 index 1d1cca8a46..0000000000 --- a/network/netcat-openbsd/patches/0003-get-sev-by-name.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 14:45:08 +0800 -Subject: get sev by name - ---- - netcat.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/netcat.c b/netcat.c -index f3cc8c1..d912544 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -949,12 +949,19 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) - void - build_ports(char *p) - { -+ struct servent *sv; - const char *errstr; - char *n; - int hi, lo, cp; - int x = 0; - -- if ((n = strchr(p, '-')) != NULL) { -+ sv = getservbyname(p, uflag ? "udp" : "tcp"); -+ if (sv) { -+ portlist[0] = calloc(1, PORT_MAX_LEN); -+ if (portlist[0] == NULL) -+ err(1, NULL); -+ snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port)); -+ } else if ((n = strchr(p, '-')) != NULL) { - *n = '\0'; - n++; - --- diff --git a/network/netcat-openbsd/patches/0004-poll-hup.patch b/network/netcat-openbsd/patches/0004-poll-hup.patch deleted file mode 100644 index 14923cbfa2..0000000000 --- a/network/netcat-openbsd/patches/0004-poll-hup.patch +++ /dev/null @@ -1,59 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:08:33 +0800 -Subject: poll hup - ---- - netcat.c | 24 +++++++++++++++++------- - 1 file changed, 17 insertions(+), 7 deletions(-) - -diff --git a/netcat.c b/netcat.c -index d912544..fdaca44 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -884,9 +884,7 @@ readwrite(int nfd) - if ((n = read(nfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_RD); -- pfd[0].fd = -1; -- pfd[0].events = 0; -+ goto shutdown_rd; - } else { - if (tflag) - atelnet(nfd, buf, n); -@@ -894,18 +892,30 @@ readwrite(int nfd) - return; - } - } -+ else if (pfd[0].revents & POLLHUP) { -+ shutdown_rd: -+ shutdown(nfd, SHUT_RD); -+ pfd[0].fd = -1; -+ pfd[0].events = 0; -+ } - -- if (!dflag && pfd[1].revents & POLLIN) { -+ if (!dflag) { -+ if(pfd[1].revents & POLLIN) { - if ((n = read(wfd, buf, plen)) < 0) - return; - else if (n == 0) { -- shutdown(nfd, SHUT_WR); -- pfd[1].fd = -1; -- pfd[1].events = 0; -+ goto shutdown_wr; - } else { - if (atomicio(vwrite, nfd, buf, n) != n) - return; - } -+ } -+ else if (pfd[1].revents & POLLHUP) { -+ shutdown_wr: -+ shutdown(nfd, SHUT_WR); -+ pfd[1].fd = -1; -+ pfd[1].events = 0; -+ } - } - } - } --- diff --git a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch b/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch deleted file mode 100644 index fa1cf991a0..0000000000 --- a/network/netcat-openbsd/patches/0008-verbose-numeric-port.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:38:15 +0800 -Subject: verbose numeric port - ---- - netcat.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 55 insertions(+), 4 deletions(-) - -diff --git a/netcat.c b/netcat.c -index baab909..eb3453e 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -41,6 +41,7 @@ - #include <netinet/tcp.h> - #include <netinet/ip.h> - #include <arpa/telnet.h> -+#include <arpa/inet.h> - - #ifndef IPTOS_LOWDELAY - # define IPTOS_LOWDELAY 0x10 -@@ -424,6 +425,18 @@ main(int argc, char *argv[]) - s = local_listen(host, uport, hints); - if (s < 0) - err(1, NULL); -+ -+ char* local; -+ if (family == AF_INET6 -+ local = "0.0.0.0"; -+ else if (family == AF_INET) -+ local = ":::"; -+ else -+ local = "unknown" -+ fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ host ?: local, -+ family, -+ *uport); - /* - * For UDP, we will use recvfrom() initially - * to wait for a caller, then use the regular -@@ -432,16 +445,15 @@ main(int argc, char *argv[]) - if (uflag) { - int rv, plen; - char buf[16384]; -- struct sockaddr_storage z; - -- len = sizeof(z); -+ len = sizeof(cliaddr); - plen = jflag ? 16384 : 2048; - rv = recvfrom(s, buf, plen, MSG_PEEK, -- (struct sockaddr *)&z, &len); -+ (struct sockaddr *)&cliaddr, &len); - if (rv < 0) - err(1, "recvfrom"); - -- rv = connect(s, (struct sockaddr *)&z, len); -+ rv = connect(s, (struct sockaddr *)&cliaddr, len); - if (rv < 0) - err(1, "connect"); - -@@ -450,6 +462,45 @@ main(int argc, char *argv[]) - len = sizeof(cliaddr); - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); -+ if(vflag) { -+ /* Don't look up port if -n. */ -+ if (nflag) -+ sv = NULL; -+ else -+ sv = getservbyport(ntohs(atoi(uport)), -+ uflag ? "udp" : "tcp"); -+ -+ if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { -+ char dst[INET_ADDRSTRLEN]; -+ inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN); -+ fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", -+ dst, -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)(&cliaddr))->sa_family, -+ ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -+ } -+ else if(((struct sockaddr *)&cliaddr)->sa_family == AF_INET6) { -+ char dst[INET6_ADDRSTRLEN]; -+ inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN); -+ fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", -+ dst, -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)&cliaddr)->sa_family, -+ ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port)); -+ } -+ else { -+ fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", -+ uport, -+ uflag ? "udp" : "tcp", -+ sv ? sv->s_name : "*", -+ ((struct sockaddr *)(&cliaddr))->sa_family, -+ ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -+ } -+ } - readwrite(connfd); - close(connfd); - } --- diff --git a/network/netcat-openbsd/patches/0009-dccp-support.patch b/network/netcat-openbsd/patches/0009-dccp-support.patch deleted file mode 100644 index 3a81b4b5ce..0000000000 --- a/network/netcat-openbsd/patches/0009-dccp-support.patch +++ /dev/null @@ -1,304 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 15:56:51 +0800 -Subject: dccp support - ---- - nc.1 | 4 ++- - netcat.c | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++------------ - 2 files changed, 93 insertions(+), 22 deletions(-) - -diff --git a/nc.1 b/nc.1 -index 0d92b74..60e3668 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -34,7 +34,7 @@ - .Sh SYNOPSIS - .Nm nc - .Bk -words --.Op Fl 46CDdhklnrStUuvz -+.Op Fl 46CDdhklnrStUuvZz - .Op Fl I Ar length - .Op Fl i Ar interval - .Op Fl O Ar length -@@ -257,6 +257,8 @@ If - .Ar port - is not specified, the well-known port for the proxy protocol is used (1080 - for SOCKS, 3128 for HTTPS). -+.It Fl Z -+DCCP mode. - .It Fl z - Specifies that - .Nm -diff --git a/netcat.c b/netcat.c -index eb3453e..56cc15e 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -129,6 +129,7 @@ int rflag; /* Random ports flag */ - char *sflag; /* Source Address */ - int tflag; /* Telnet Emulation */ - int uflag; /* UDP - Default to TCP */ -+int dccpflag; /* DCCP - Default to TCP */ - int vflag; /* Verbosity */ - int xflag; /* Socks proxy */ - int zflag; /* Port Scan Flag */ -@@ -160,6 +161,7 @@ int unix_listen(char *); - void set_common_sockopts(int); - int map_tos(char *, int *); - void usage(int); -+char *proto_name(int uflag, int dccpflag); - - static int connect_with_timeout(int fd, const struct sockaddr *sa, - socklen_t salen, int ctimeout); -@@ -187,7 +189,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:z")) != -1) { -+ "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -258,6 +260,13 @@ main(int argc, char *argv[]) - case 'u': - uflag = 1; - break; -+ case 'Z': -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ dccpflag = 1; -+# else -+ errx(1, "no DCCP support available"); -+# endif -+ break; - case 'V': - # if defined(RT_TABLEID_MAX) - rtableid = (unsigned int)strtonum(optarg, 0, -@@ -333,6 +342,12 @@ main(int argc, char *argv[]) - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { -+ if (uflag) -+ errx(1, "cannot use -u and -U"); -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ if (dccpflag) -+ errx(1, "cannot use -Z and -U"); -+# endif - host = argv[0]; - uport = NULL; - } else if (!argv[0] && lflag) { -@@ -374,8 +389,20 @@ main(int argc, char *argv[]) - if (family != AF_UNIX) { - memset(&hints, 0, sizeof(struct addrinfo)); - hints.ai_family = family; -- hints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -- hints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP; -+ if (uflag) { -+ hints.ai_socktype = SOCK_DGRAM; -+ hints.ai_protocol = IPPROTO_UDP; -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ hints.ai_socktype = SOCK_DCCP; -+ hints.ai_protocol = IPPROTO_DCCP; -+ } -+# endif -+ else { -+ hints.ai_socktype = SOCK_STREAM; -+ hints.ai_protocol = IPPROTO_TCP; -+ } - if (nflag) - hints.ai_flags |= AI_NUMERICHOST; - } -@@ -383,7 +410,10 @@ main(int argc, char *argv[]) - if (xflag) { - if (uflag) - errx(1, "no proxy support for UDP mode"); -- -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ if (dccpflag) -+ errx(1, "no proxy support for DCCP mode"); -+# endif - if (lflag) - errx(1, "no proxy support for listen"); - -@@ -427,12 +457,12 @@ main(int argc, char *argv[]) - err(1, NULL); - - char* local; -- if (family == AF_INET6 -+ if (family == AF_INET6 ) - local = "0.0.0.0"; - else if (family == AF_INET) - local = ":::"; - else -- local = "unknown" -+ local = "unknown"; - fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", - host ?: local, - family, -@@ -463,12 +493,13 @@ main(int argc, char *argv[]) - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); - if(vflag) { -+ char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else - sv = getservbyport(ntohs(atoi(uport)), -- uflag ? "udp" : "tcp"); -+ proto); - - if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { - char dst[INET_ADDRSTRLEN]; -@@ -476,7 +507,7 @@ main(int argc, char *argv[]) - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -@@ -487,7 +518,7 @@ main(int argc, char *argv[]) - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)&cliaddr)->sa_family, - ntohs(((struct sockaddr_in6 *)&cliaddr)->sin6_port)); -@@ -495,7 +526,7 @@ main(int argc, char *argv[]) - else { - fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", - uport, -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); -@@ -559,19 +590,20 @@ main(int argc, char *argv[]) - } - } - -+ char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else { - sv = getservbyport( - ntohs(atoi(portlist[i])), -- uflag ? "udp" : "tcp"); -+ proto); - } - - fprintf(stderr, - "Connection to %s %s port [%s/%s] " - "succeeded!\n", host, portlist[i], -- uflag ? "udp" : "tcp", -+ proto, - sv ? sv->s_name : "*"); - } - if (!zflag) -@@ -671,6 +703,24 @@ unix_listen(char *path) - return (s); - } - -+char *proto_name(uflag, dccpflag) { -+ -+ char *proto = NULL; -+ if (uflag) { -+ proto = "udp"; -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ proto = "dccp"; -+ } -+# endif -+ else { -+ proto = "tcp"; -+ } -+ -+ return proto; -+} -+ - /* - * remote_connect() - * Returns a socket connected to a remote host. Properly binds to a local -@@ -709,8 +759,21 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - # endif - memset(&ahints, 0, sizeof(struct addrinfo)); - ahints.ai_family = res0->ai_family; -- ahints.ai_socktype = uflag ? SOCK_DGRAM : SOCK_STREAM; -- ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP; -+ if (uflag) { -+ ahints.ai_socktype = SOCK_DGRAM; -+ ahints.ai_protocol = IPPROTO_UDP; -+ -+ } -+# if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) -+ else if (dccpflag) { -+ hints.ai_socktype = SOCK_DCCP; -+ hints.ai_protocol = IPPROTO_DCCP; -+ } -+# endif -+ else { -+ ahints.ai_socktype = SOCK_STREAM; -+ ahints.ai_protocol = IPPROTO_TCP; -+ } - ahints.ai_flags = AI_PASSIVE; - if ((error = getaddrinfo(sflag, pflag, &ahints, &ares))) - errx(1, "getaddrinfo: %s", gai_strerror(error)); -@@ -722,15 +785,19 @@ remote_connect(const char *host, const char *port, struct addrinfo hints) - } - - set_common_sockopts(s); -+ char *proto = proto_name(uflag, dccpflag); - -- if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) -+ if ((error = connect_with_timeout(s, res0->ai_addr, res0->ai_addrlen, timeout))== CONNECTION_SUCCESS) { - break; -- else if (vflag && error == CONNECTION_FAILED) -+ } -+ else if (vflag && error == CONNECTION_FAILED) { - warn("connect to %s port %s (%s) failed", host, port, -- uflag ? "udp" : "tcp"); -- else if (vflag && error == CONNECTION_TIMEOUT) -+ proto); -+ } -+ else if (vflag && error == CONNECTION_TIMEOUT) { - warn("connect to %s port %s (%s) timed out", host, port, -- uflag ? "udp" : "tcp"); -+ proto); -+ } - - close(s); - s = -1; -@@ -1047,7 +1114,8 @@ build_ports(char *p) - int hi, lo, cp; - int x = 0; - -- sv = getservbyname(p, uflag ? "udp" : "tcp"); -+ char *proto = proto_name(uflag, dccpflag); -+ sv = getservbyname(p, proto); - if (sv) { - portlist[0] = calloc(1, PORT_MAX_LEN); - if (portlist[0] == NULL) -@@ -1252,6 +1320,7 @@ help(void) - \t-w secs\t Timeout for connects and final net reads\n\ - \t-X proto Proxy protocol: \"4\", \"5\" (SOCKS) or \"connect\"\n\ - \t-x addr[:port]\tSpecify proxy address and port\n\ -+ \t-Z DCCP mode\n\ - \t-z Zero-I/O mode [used for scanning]\n\ - Port numbers can be individual or ranges: lo-hi [inclusive]\n"); - exit(0); -@@ -1261,7 +1330,7 @@ void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46CDdhjklnrStUuvz] [-I length] [-i interval] [-O length]\n" -+ "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" - "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n" - "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); --- diff --git a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch b/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch deleted file mode 100644 index 3ed0523cff..0000000000 --- a/network/netcat-openbsd/patches/0011-misc-failures-and-features.patch +++ /dev/null @@ -1,457 +0,0 @@ -From: Aron Xu <aron@debian.org> -Date: Mon, 13 Feb 2012 19:06:52 +0800 -Subject: misc connection failures - ---- - nc.1 | 76 ++++++++++++++++++++++++++++++++++++--- - netcat.c | 119 ++++++++++++++++++++++++++++++++++++++++++-------------------- - 2 files changed, 153 insertions(+), 42 deletions(-) - -diff --git a/nc.1 b/nc.1 -index 60e3668..477cb1b 100644 ---- a/nc.1 -+++ b/nc.1 -@@ -34,7 +34,7 @@ - .Sh SYNOPSIS - .Nm nc - .Bk -words --.Op Fl 46CDdhklnrStUuvZz -+.Op Fl 46bCDdhklnrStUuvZz - .Op Fl I Ar length - .Op Fl i Ar interval - .Op Fl O Ar length -@@ -99,6 +99,8 @@ to use IPv4 addresses only. - Forces - .Nm - to use IPv6 addresses only. -+.It Fl b -+Allow broadcast. - .It Fl C - Send CRLF as line-ending. - .It Fl D -@@ -323,6 +325,54 @@ and which side is being used as a - The connection may be terminated using an - .Dv EOF - .Pq Sq ^D . -+.Pp -+There is no -+.Fl c -+or -+.Fl e -+option in this netcat, but you still can execute a command after connection -+being established by redirecting file descriptors. Be cautious here because -+opening a port and let anyone connected execute arbitrary command on your -+site is DANGEROUS. If you really need to do this, here is an example: -+.Pp -+On -+.Sq server -+side: -+.Pp -+.Dl $ rm -f /tmp/f; mkfifo /tmp/f -+.Dl $ cat /tmp/f | /bin/sh -i 2>&1 | nc -l 127.0.0.1 1234 > /tmp/f -+.Pp -+On -+.Sq client -+side: -+.Pp -+.Dl $ nc host.example.com 1234 -+.Dl $ (shell prompt from host.example.com) -+.Pp -+By doing this, you create a fifo at /tmp/f and make nc listen at port 1234 -+of address 127.0.0.1 on -+.Sq server -+side, when a -+.Sq client -+establishes a connection successfully to that port, /bin/sh gets executed -+on -+.Sq server -+side and the shell prompt is given to -+.Sq client -+side. -+.Pp -+When connection is terminated, -+.Nm -+quits as well. Use -+.Fl k -+if you want it keep listening, but if the command quits this option won't -+restart it or keep -+.Nm -+running. Also don't forget to remove the file descriptor once you don't need -+it anymore: -+.Pp -+.Dl $ rm -f /tmp/f -+.Pp - .Sh DATA TRANSFER - The example in the previous section can be expanded to build a - basic data transfer model. -@@ -382,15 +432,30 @@ The - flag can be used to tell - .Nm - to report open ports, --rather than initiate a connection. -+rather than initiate a connection. Usually it's useful to turn on verbose -+output to stderr by use this option in conjunction with -+.Fl v -+option. -+.Pp - For example: - .Bd -literal -offset indent --$ nc -z host.example.com 20-30 -+$ nc \-zv host.example.com 20-30 - Connection to host.example.com 22 port [tcp/ssh] succeeded! - Connection to host.example.com 25 port [tcp/smtp] succeeded! - .Ed - .Pp --The port range was specified to limit the search to ports 20 \- 30. -+The port range was specified to limit the search to ports 20 \- 30, and is -+scanned by increasing order. -+.Pp -+You can also specify a list of ports to scan, for example: -+.Bd -literal -offset indent -+$ nc \-zv host.example.com 80 20 22 -+nc: connect to host.example.com 80 (tcp) failed: Connection refused -+nc: connect to host.example.com 20 (tcp) failed: Connection refused -+Connection to host.example.com port [tcp/ssh] succeeded! -+.Ed -+.Pp -+The ports are scanned by the order you given. - .Pp - Alternatively, it might be useful to know which server software - is running, and which versions. -@@ -455,6 +520,9 @@ Original implementation by *Hobbit* - .br - Rewritten with IPv6 support by - .An Eric Jackson Aq ericj@monkey.org . -+.br -+Modified for Debian port by Aron Xu -+.Aq aron@debian.org . - .Sh CAVEATS - UDP port scans using the - .Fl uz -diff --git a/netcat.c b/netcat.c -index bf9940f..c938d11 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -88,6 +88,7 @@ - #include <netdb.h> - #include <poll.h> - #include <signal.h> -+#include <stddef.h> - #include <stdarg.h> - #include <stdio.h> - #include <stdlib.h> -@@ -115,6 +116,7 @@ - #define UDP_SCAN_TIMEOUT 3 /* Seconds */ - - /* Command Line Options */ -+int bflag; /* Allow Broadcast */ - int Cflag = 0; /* CRLF line-ending */ - int dflag; /* detached, no stdin */ - unsigned int iflag; /* Interval Flag */ -@@ -146,7 +148,7 @@ char *portlist[PORT_MAX+1]; - char *unix_dg_tmp_socket; - - void atelnet(int, unsigned char *, unsigned int); --void build_ports(char *); -+void build_ports(char **); - void help(void); - int local_listen(char *, char *, struct addrinfo); - void readwrite(int); -@@ -171,11 +173,14 @@ int - main(int argc, char *argv[]) - { - int ch, s, ret, socksv; -- char *host, *uport; -+ char *host, **uport; - struct addrinfo hints; - struct servent *sv; - socklen_t len; -- struct sockaddr_storage cliaddr; -+ union { -+ struct sockaddr_storage storage; -+ struct sockaddr_un forunix; -+ } cliaddr; - char *proxy = NULL; - const char *errstr, *proxyhost = "", *proxyport = NULL; - struct addrinfo proxyhints; -@@ -189,7 +194,7 @@ main(int argc, char *argv[]) - sv = NULL; - - while ((ch = getopt(argc, argv, -- "46CDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { -+ "46bCDdhI:i:jklnO:P:p:q:rSs:tT:UuV:vw:X:x:Zz")) != -1) { - switch (ch) { - case '4': - family = AF_INET; -@@ -197,6 +202,13 @@ main(int argc, char *argv[]) - case '6': - family = AF_INET6; - break; -+ case 'b': -+# if defined(SO_BROADCAST) -+ bflag = 1; -+# else -+ errx(1, "no broadcast frame support available"); -+# endif -+ break; - case 'U': - family = AF_UNIX; - break; -@@ -342,35 +354,40 @@ main(int argc, char *argv[]) - - /* Cruft to make sure options are clean, and used properly. */ - if (argv[0] && !argv[1] && family == AF_UNIX) { -- if (uflag) -- errx(1, "cannot use -u and -U"); - # if defined(IPPROTO_DCCP) && defined(SOCK_DCCP) - if (dccpflag) - errx(1, "cannot use -Z and -U"); - # endif - host = argv[0]; - uport = NULL; -- } else if (!argv[0] && lflag) { -- if (sflag) -- errx(1, "cannot use -s and -l"); -- if (zflag) -- errx(1, "cannot use -z and -l"); -- if (pflag) -- uport=pflag; -- } else if (!lflag && kflag) { -- errx(1, "cannot use -k without -l"); -- } else if (argv[0] && !argv[1]) { -- if (!lflag) -- usage(1); -- uport = argv[0]; -+ } else if (argv[0] && !argv[1] && lflag) { -+ if (pflag) { -+ uport = &pflag; -+ host = argv[0]; -+ } else { -+ uport = argv; -+ host = NULL; -+ } -+ } else if (!argv[0] && lflag && pflag) { -+ uport = &pflag; - host = NULL; - } else if (argv[0] && argv[1]) { - host = argv[0]; -- uport = argv[1]; -+ uport = &argv[1]; - } else - usage(1); - -- -+ if (lflag) { -+ if (sflag) -+ errx(1, "cannot use -s and -l"); -+ if (zflag) -+ errx(1, "cannot use -z and -l"); -+ if (pflag) -+ /* This still does not work well because of getopt mess -+ errx(1, "cannot use -p and -l"); */ -+ uport = &pflag; -+ } else if (!lflag && kflag) -+ errx(1, "cannot use -k without -l"); - - /* Get name of temporary socket for unix datagram client */ - if ((family == AF_UNIX) && uflag && !lflag) { -@@ -448,7 +465,7 @@ main(int argc, char *argv[]) - else - s = unix_listen(host); - } else -- s = local_listen(host, uport, hints); -+ s = local_listen(host, *uport, hints); - if (s < 0) - err(1, NULL); - -@@ -457,7 +474,8 @@ main(int argc, char *argv[]) - local = ":::"; - else - local = "0.0.0.0"; -- fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ if (vflag && (family != AF_UNIX)) -+ fprintf(stderr, "Listening on [%s] (family %d, port %s)\n", - host ?: local, - family, - *uport); -@@ -490,13 +508,17 @@ main(int argc, char *argv[]) - len = sizeof(cliaddr); - connfd = accept(s, (struct sockaddr *)&cliaddr, - &len); -- if(vflag) { -+ if(vflag && family == AF_UNIX) { -+ fprintf(stderr, "Connection from \"%.*s\" accepted\n", -+ (len - (int)offsetof(struct sockaddr_un, sun_path)), -+ ((struct sockaddr_un*)&cliaddr)->sun_path); -+ } else if(vflag) { - char *proto = proto_name(uflag, dccpflag); - /* Don't look up port if -n. */ - if (nflag) - sv = NULL; - else -- sv = getservbyport(ntohs(atoi(uport)), -+ sv = getservbyport(ntohs(atoi(*uport)), - proto); - - if (((struct sockaddr *)&cliaddr)->sa_family == AF_INET) { -@@ -504,7 +526,7 @@ main(int argc, char *argv[]) - inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in *)&cliaddr)->sin_addr),dst,INET_ADDRSTRLEN); - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, -@@ -515,7 +537,7 @@ main(int argc, char *argv[]) - inet_ntop(((struct sockaddr *)&cliaddr)->sa_family,&(((struct sockaddr_in6 *)&cliaddr)->sin6_addr),dst,INET6_ADDRSTRLEN); - fprintf(stderr, "Connection from [%s] port %s [%s/%s] accepted (family %d, sport %d)\n", - dst, -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)&cliaddr)->sa_family, -@@ -523,17 +545,21 @@ main(int argc, char *argv[]) - } - else { - fprintf(stderr, "Connection from unknown port %s [%s/%s] accepted (family %d, sport %d)\n", -- uport, -+ *uport, - proto, - sv ? sv->s_name : "*", - ((struct sockaddr *)(&cliaddr))->sa_family, - ntohs(((struct sockaddr_in *)&cliaddr)->sin_port)); - } - } -+ if(!kflag) -+ close(s); - readwrite(connfd); - close(connfd); - } - -+ if (vflag && kflag) -+ fprintf(stderr, "Connection closed, listening again.\n"); - if (kflag) - continue; - if (family != AF_UNIX) { -@@ -641,6 +667,8 @@ unix_bind(char *path) - return (-1); - } - -+ unlink(path); -+ - if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) { - close(s); - return (-1); -@@ -662,8 +690,10 @@ unix_connect(char *path) - if ((s = unix_bind(unix_dg_tmp_socket)) < 0) - return (-1); - } else { -- if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) -+ if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0) { -+ errx(1,"create unix socket failed"); - return (-1); -+ } - } - (void)fcntl(s, F_SETFD, 1); - -@@ -674,9 +704,11 @@ unix_connect(char *path) - sizeof(sun.sun_path)) { - close(s); - errno = ENAMETOOLONG; -+ warn("unix connect abandoned"); - return (-1); - } - if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) { -+ warn("unix connect failed"); - close(s); - return (-1); - } -@@ -1105,22 +1137,23 @@ atelnet(int nfd, unsigned char *buf, unsigned int size) - * that we should try to connect to. - */ - void --build_ports(char *p) -+build_ports(char **p) - { - struct servent *sv; - const char *errstr; - char *n; - int hi, lo, cp; - int x = 0; -+ int i; - - char *proto = proto_name(uflag, dccpflag); -- sv = getservbyname(p, proto); -+ sv = getservbyname(*p, proto); - if (sv) { - portlist[0] = calloc(1, PORT_MAX_LEN); - if (portlist[0] == NULL) - err(1, NULL); - snprintf(portlist[0], PORT_MAX_LEN, "%d", ntohs(sv->s_port)); -- } else if ((n = strchr(p, '-')) != NULL) { -+ } else if ((n = strchr(*p, '-')) != NULL) { - *n = '\0'; - n++; - -@@ -1128,9 +1161,9 @@ build_ports(char *p) - hi = strtonum(n, 1, PORT_MAX, &errstr); - if (errstr) - errx(1, "port number %s: %s", errstr, n); -- lo = strtonum(p, 1, PORT_MAX, &errstr); -+ lo = strtonum(*p, 1, PORT_MAX, &errstr); - if (errstr) -- errx(1, "port number %s: %s", errstr, p); -+ errx(1, "port number %s: %s", errstr, *p); - - if (lo > hi) { - cp = hi; -@@ -1160,10 +1193,12 @@ build_ports(char *p) - } - } - } else { -- hi = strtonum(p, 1, PORT_MAX, &errstr); -+ hi = strtonum(*p, 1, PORT_MAX, &errstr); - if (errstr) -- errx(1, "port number %s: %s", errstr, p); -- portlist[0] = strdup(p); -+ errx(1, "port number %s: %s", errstr, *p); -+ for (i=0;p[i];i++) { -+ portlist[i] = strdup(p[i]); -+ } - if (portlist[0] == NULL) - err(1, NULL); - } -@@ -1198,6 +1233,13 @@ set_common_sockopts(int s) - { - int x = 1; - -+# if defined(SO_BROADCAST) -+ if (bflag) { -+ if (setsockopt(s, IPPROTO_TCP, SO_BROADCAST, -+ &x, sizeof(x)) == -1) -+ err(1, NULL); -+ } -+# endif - # if defined(TCP_MD5SIG) - if (Sflag) { - if (setsockopt(s, IPPROTO_TCP, TCP_MD5SIG, -@@ -1293,6 +1335,7 @@ help(void) - fprintf(stderr, "\tCommand Summary:\n\ - \t-4 Use IPv4\n\ - \t-6 Use IPv6\n\ -+ \t-b Allow broadcast\n\ - \t-C Send CRLF as line-ending\n\ - \t-D Enable the debug socket option\n\ - \t-d Detach from stdin\n\ -@@ -1329,7 +1372,7 @@ void - usage(int ret) - { - fprintf(stderr, -- "usage: nc [-46CDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" -+ "usage: nc [-46bCDdhjklnrStUuvZz] [-I length] [-i interval] [-O length]\n" - "\t [-P proxy_username] [-p source_port] [-q seconds] [-s source]\n" - "\t [-T toskeyword] [-V rtable] [-w timeout] [-X proxy_protocol]\n" - "\t [-x proxy_address[:port]] [destination] [port]\n"); --- |