-
Notifications
You must be signed in to change notification settings - Fork 3
/
Copy pathnc-3.2-owl-fixes.diff
281 lines (247 loc) · 6.36 KB
/
nc-3.2-owl-fixes.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
diff -urN --show-c-function nc-3.2-owl-linux/usr.bin/nc/netcat.c nc-3.2-owl-fixes/usr.bin/nc/netcat.c
--- nc-3.2-owl-linux/usr.bin/nc/netcat.c Fri Jan 24 01:13:33 2003
+++ nc-3.2-owl-fixes/usr.bin/nc/netcat.c Tue Jul 20 01:03:19 2004
@@ -277,16 +277,19 @@ main(int argc, char *argv[])
rv = recvfrom(s, buf, sizeof(buf), MSG_PEEK,
(struct sockaddr *)&z, &len);
if (rv < 0)
- errx(1, "%s", strerror(errno));
+ err(1, "recvfrom");
rv = connect(s, (struct sockaddr *)&z, len);
if (rv < 0)
- errx(1, "%s", strerror(errno));
+ err(1, "connect");
connfd = s;
} else {
+ len = sizeof(cliaddr);
connfd = accept(s, (struct sockaddr *)&cliaddr,
&len);
+ if (connfd < 0)
+ err(1, "accept");
}
readwrite(connfd);
@@ -319,39 +322,46 @@ main(int argc, char *argv[])
if (s)
close(s);
+ /* Don't lookup port if -n */
+ if (nflag)
+ sv = NULL;
+ else {
+ sv = getservbyport(
+ ntohs(atoi(portlist[i])),
+ uflag ? "udp" : "tcp");
+ }
+
if (xflag)
s = socks_connect(host, portlist[i], hints,
proxyhost, proxyport, proxyhints, socksv);
else
s = remote_connect(host, portlist[i], hints);
- if (s < 0)
- continue;
-
ret = 0;
- if (vflag || zflag) {
- /* For UDP, make sure we are connected */
- if (uflag) {
- if (udptest(s) == -1) {
- ret = 1;
- continue;
- }
+ if (s >= 0) {
+ if (uflag && zflag)
+ ret = (udptest(s) == -1) ? 1 : 0;
+ } else
+ ret = 1;
+
+ if (vflag) {
+ if (ret) {
+ printf("Connection to %s %s port "
+ "[%s/%s] failed : %s\n",
+ host, portlist[i],
+ uflag ? "udp" : "tcp",
+ sv ? sv->s_name : "*",
+ strerror(errno));
+ } else {
+ printf("Connection to %s %s port "
+ "[%s/%s] succeeded!\n",
+ host, portlist[i],
+ uflag ? "udp" : "tcp",
+ sv ? sv->s_name : "*");
}
-
- /* Don't lookup port if -n */
- if (nflag)
- sv = NULL;
- else {
- sv = getservbyport(
- ntohs(atoi(portlist[i])),
- uflag ? "udp" : "tcp");
- }
-
- printf("Connection to %s %s port [%s/%s] succeeded!\n",
- host, portlist[i], uflag ? "udp" : "tcp",
- sv ? sv->s_name : "*");
}
- if (!zflag)
+
+ if (!zflag && !ret)
readwrite(s);
}
}
@@ -373,7 +383,7 @@ unix_connect(char *path)
int s;
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
- return (-1);
+ err(1, "socket");
(void)fcntl(s, F_SETFD, 1);
memset(&sun, 0, sizeof(struct sockaddr_un));
@@ -385,8 +395,7 @@ unix_connect(char *path)
}
if (connect(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
- close(s);
- return (-1);
+ err(1, "connect");
}
return (s);
@@ -404,7 +413,7 @@ unix_listen(char *path)
/* create unix domain socket */
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
- return (-1);
+ err(1, "socket");
memset(&sun, 0, sizeof(struct sockaddr_un));
sun.sun_family = AF_UNIX;
@@ -415,13 +424,11 @@ unix_listen(char *path)
}
if (bind(s, (struct sockaddr *)&sun, SUN_LEN(&sun)) < 0) {
- close(s);
- return (-1);
+ err(1, "bind");
}
if (listen(s, 5) < 0) {
- close(s);
- return (-1);
+ err(1, "listen");
}
return (s);
}
@@ -435,10 +442,10 @@ int
remote_connect(char *host, char *port, struct addrinfo hints)
{
struct addrinfo *res, *res0;
- int s, error;
+ int s, error, saved_errno = 0;
if ((error = getaddrinfo(host, port, &hints, &res)))
- errx(1, "%s", gai_strerror(error));
+ errx(1, "getaddrinfo: %s", gai_strerror(error));
res0 = res;
do {
@@ -463,12 +470,14 @@ remote_connect(char *host, char *port, s
ahints.ai_protocol = uflag ? IPPROTO_UDP : IPPROTO_TCP;
ahints.ai_flags = AI_PASSIVE;
if ((error = getaddrinfo(sflag, pflag, &ahints, &ares)))
- errx(1, "%s", gai_strerror(error));
+ errx(1, "getaddrinfo: %s", gai_strerror(error));
if (bind(s, (struct sockaddr *)ares->ai_addr,
ares->ai_addrlen) < 0) {
- errx(1, "bind failed: %s", strerror(errno));
+ warn("bind");
freeaddrinfo(ares);
+ close(s);
+ s = -1;
continue;
}
freeaddrinfo(ares);
@@ -477,12 +486,17 @@ remote_connect(char *host, char *port, s
if (connect(s, res0->ai_addr, res0->ai_addrlen) == 0)
break;
+ saved_errno = errno;
+
close(s);
s = -1;
} while ((res0 = res0->ai_next) != NULL);
freeaddrinfo(res);
+ if (s == -1)
+ errno = saved_errno;
+
return (s);
}
@@ -509,7 +523,7 @@ local_listen(char *host, char *port, str
hints.ai_family = AF_INET;
if ((error = getaddrinfo(host, port, &hints, &res)))
- errx(1, "%s", gai_strerror(error));
+ errx(1, "getaddrinfo: %s", gai_strerror(error));
res0 = res;
do {
@@ -519,23 +533,24 @@ local_listen(char *host, char *port, str
ret = setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &x, sizeof(x));
if (ret == -1)
- exit(1);
+ err(1, "setsockopt");
if (bind(s, (struct sockaddr *)res0->ai_addr,
res0->ai_addrlen) == 0)
break;
+ warn("bind");
close(s);
s = -1;
} while ((res0 = res0->ai_next) != NULL);
+ freeaddrinfo(res);
+
if (!uflag && s != -1) {
if (listen(s, 1) < 0)
- errx(1, "%s", strerror(errno));
+ err(1, "listen");
}
- freeaddrinfo(res);
-
return (s);
}
@@ -571,7 +586,7 @@ readwrite(int nfd)
if (n == 0)
return;
- if (pfd[0].revents & POLLIN) {
+ if (pfd[0].revents & (POLLIN | POLLERR)) {
if ((n = read(nfd, buf, sizeof(buf))) < 0)
return;
else if (n == 0) {
@@ -694,23 +709,20 @@ build_ports(char *p)
}
}
-/*
- * udptest()
- * Do a few writes to see if the UDP port is there.
- * XXX - Better way of doing this? Doesn't work for IPv6
- * Also fails after around 100 ports checked.
- */
int
udptest(int s)
{
- int i, rv, ret;
+ int rv, ret;
+
+ write(s, "X", 1);
+
+ sleep(3);
+
+ if ((rv = write(s, "X", 1)) == 1)
+ ret = 1;
+ else
+ ret = -1;
- for (i = 0; i <= 3; i++) {
- if ((rv = write(s, "X", 1)) == 1)
- ret = 1;
- else
- ret = -1;
- }
return (ret);
}
diff -urN --show-c-function nc-3.2-owl-linux/usr.bin/nc/socks.c nc-3.2-owl-fixes/usr.bin/nc/socks.c
--- nc-3.2-owl-linux/usr.bin/nc/socks.c Fri Jan 24 01:13:33 2003
+++ nc-3.2-owl-fixes/usr.bin/nc/socks.c Fri Jan 24 01:13:52 2003
@@ -102,7 +102,7 @@ socks_connect (char *host, char *port, s
else
proxyfd = remote_connect(proxyhost, SOCKS_PORT, proxyhints);
- if (!proxyfd)
+ if (proxyfd < 0)
return -1;
serveraddr = decode_addr (host);