50 lines
1.0 KiB
Diff
50 lines
1.0 KiB
Diff
|
From: Aron Xu <aron@debian.org>
|
||
|
|
Date: Tue, 14 Feb 2012 23:02:00 +0800
|
||
|
|
Subject: serialized handling multiple clients
|
||
|
|
|
||
|
|
---
|
||
|
|
netcat.c | 17 ++++++++---------
|
||
|
|
1 file changed, 8 insertions(+), 9 deletions(-)
|
||
|
|
|
||
|
|
--- a/netcat.c
|
||
|
|
+++ b/netcat.c
|
||
|
|
@@ -707,7 +707,10 @@ main(int argc, char *argv[])
|
||
|
|
s = unix_bind(host, 0);
|
||
|
|
else
|
||
|
|
s = unix_listen(host);
|
||
|
|
- }
|
||
|
|
+ } else
|
||
|
|
+ s = local_listen(host, uport, hints);
|
||
|
|
+ if (s < 0)
|
||
|
|
+ err(1, NULL);
|
||
|
|
|
||
|
|
# if defined(TLS)
|
||
|
|
if (usetls) {
|
||
|
|
@@ -721,13 +724,6 @@ main(int argc, char *argv[])
|
||
|
|
# endif
|
||
|
|
/* Allow only one connection at a time, but stay alive. */
|
||
|
|
for (;;) {
|
||
|
|
- if (family != AF_UNIX) {
|
||
|
|
- if (s != -1)
|
||
|
|
- close(s);
|
||
|
|
- s = local_listen(host, uport, hints);
|
||
|
|
- }
|
||
|
|
- if (s < 0)
|
||
|
|
- err(1, NULL);
|
||
|
|
if (uflag && kflag) {
|
||
|
|
/*
|
||
|
|
* For UDP and -k, don't connect the socket,
|
||
|
|
@@ -804,8 +800,11 @@ main(int argc, char *argv[])
|
||
|
|
err(1, "connect");
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (!kflag)
|
||
|
|
+ if (!kflag) {
|
||
|
|
+ if (s != -1)
|
||
|
|
+ close(s);
|
||
|
|
break;
|
||
|
|
+ }
|
||
|
|
}
|
||
|
|
} else if (family == AF_UNIX) {
|
||
|
|
ret = 0;
|