summaryrefslogtreecommitdiffstats
path: root/usr.bin/telnet
diff options
context:
space:
mode:
authorshin <shin@FreeBSD.org>2000-02-15 15:59:12 +0000
committershin <shin@FreeBSD.org>2000-02-15 15:59:12 +0000
commit77f276d5acc586c5900491e6b280b246771e7705 (patch)
tree7ba9cbc8ff2e1e8bc75dd2690758691343bb38d7 /usr.bin/telnet
parentc83f0a97bdc03cca93e16e1bc2758c713aef5fdf (diff)
downloadFreeBSD-src-77f276d5acc586c5900491e6b280b246771e7705.zip
FreeBSD-src-77f276d5acc586c5900491e6b280b246771e7705.tar.gz
Fix bugs in telnet.
Sorry there were still several bugs. -error retry at af missmatch was incomplete. -af matching for source addr option was wrong -socket was not freed at retry. Approved by: jkh
Diffstat (limited to 'usr.bin/telnet')
-rw-r--r--usr.bin/telnet/commands.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index 1e653bc..31a3838 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -2329,13 +2329,14 @@ tn(argc, argv)
goto fail;
}
res0 = res;
+ af_again:
if (srcroute != 0) {
char hostbuf[BUFSIZ];
- strncpy(hostbuf, hostp, BUFSIZ - 1);
- hostbuf[BUFSIZ - 1] = '\0';
- af_again:
- if (af_error != 0)
+ if (af_error == 0) { /* save intermediate hostnames for retry */
+ strncpy(hostbuf, hostp, BUFSIZ - 1);
+ hostbuf[BUFSIZ - 1] = '\0';
+ } else
hostp = hostbuf;
srp = 0;
result = sourceroute(res, hostp, &srp, &srlen, &proto, &opt);
@@ -2395,8 +2396,8 @@ tn(argc, argv)
if (src_addr != NULL) {
for (src_res = src_res0; src_res != 0; src_res = src_res->ai_next)
- if (src_res->ai_family != res->ai_family)
- continue;
+ if (src_res->ai_family == res->ai_family)
+ break;
if (src_res == NULL)
src_res = src_res0;
if (bind(net, src_res->ai_addr, src_res->ai_addrlen) == -1) {
@@ -2404,18 +2405,24 @@ tn(argc, argv)
if (family == AF_UNSPEC && af_error == 0 &&
switch_af(&res) == 1) {
af_error = 1;
+ (void) NetClose(net);
goto af_again;
}
#endif
perror("bind");
+ (void) NetClose(net);
goto fail;
}
}
#if defined(IPSEC) && defined(IPSEC_POLICY_IPSEC)
- if (setpolicy(net, res, ipsec_policy_in) < 0)
+ if (setpolicy(net, res, ipsec_policy_in) < 0) {
+ (void) NetClose(net);
goto fail;
- if (setpolicy(net, res, ipsec_policy_out) < 0)
+ }
+ if (setpolicy(net, res, ipsec_policy_out) < 0) {
+ (void) NetClose(net);
goto fail;
+ }
#endif
if (connect(net, res->ai_addr, res->ai_addrlen) < 0) {
@@ -2438,6 +2445,7 @@ tn(argc, argv)
continue;
}
perror("telnet: Unable to connect to remote host");
+ (void) NetClose(net);
goto fail;
}
connected++;
OpenPOWER on IntegriCloud