From 95008285045d7130c028d6755dcc2bae5387cb22 Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Fri, 3 Jan 2020 23:09:25 +0100 Subject: 20200103.1 global branch merge. Signed-off-by: Matteo Bernardini --- ...0010-serialized-handling-multiple-clients.patch | 75 ---------------------- 1 file changed, 75 deletions(-) delete mode 100644 network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch (limited to 'network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch') diff --git a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch b/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch deleted file mode 100644 index 0d3ea68b96..0000000000 --- a/network/netcat-openbsd/patches/0010-serialized-handling-multiple-clients.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Aron Xu -Date: Tue, 14 Feb 2012 23:02:00 +0800 -Subject: serialized handling multiple clients - ---- - netcat.c | 39 +++++++++++++++++++-------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/netcat.c b/netcat.c -index 56cc15e..bf9940f 100644 ---- a/netcat.c -+++ b/netcat.c -@@ -447,26 +447,24 @@ main(int argc, char *argv[]) - s = unix_bind(host); - else - s = unix_listen(host); -- } -+ } else -+ s = local_listen(host, uport, hints); -+ if (s < 0) -+ err(1, NULL); -+ -+ char* local; -+ if (family == AF_INET6) -+ local = ":::"; -+ else -+ local = "0.0.0.0"; -+ fprintf(stderr, "Listening on [%s] (family %d, port %d)\n", -+ host ?: local, -+ family, -+ *uport); - - /* Allow only one connection at a time, but stay alive. */ - for (;;) { -- if (family != AF_UNIX) -- 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 -@@ -536,15 +534,16 @@ main(int argc, char *argv[]) - close(connfd); - } - -- if (family != AF_UNIX) -+ if (kflag) -+ continue; -+ if (family != AF_UNIX) { - close(s); -+ } - else if (uflag) { - if (connect(s, NULL, 0) < 0) - err(1, "connect"); - } -- -- if (!kflag) -- break; -+ break; - } - } else if (family == AF_UNIX) { - ret = 0; --- -- cgit v1.2.3