d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Print "Trying ..." for each host. Also cleanups for error printing.

Browse Source 
Approved by: jkh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>
This commit is contained in:
Yoshinobu Inoue 2000-02-19 16:17:41 +00:00
parent 7f14aa9b8a
commit a82a4df889
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=57342
3 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/telnet/telnet/commands.c
View File

@ -2532,8 +2532,8 @@ tn(argc, argv)
goto fail;
}
}
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
do {
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
setuid(getuid());
if (net < 0) {
@ -2609,18 +2609,13 @@ tn(argc, argv)
if (af_error != 0)
while (next != NULL && next->ai_family != res->ai_family)
next = next->ai_next;
warn("connect to address %s", sockaddr_ntop(res->ai_addr));
if (next != NULL) {
int oerrno = errno;
fprintf(stderr, "telnet: connect to address %s: ",
sockaddr_ntop(res->ai_addr));
errno = oerrno;
perror((char *)0);
res = next;
(void) NetClose(net);
continue;
}
perror("telnet: Unable to connect to remote host");
warnx("Unable to connect to remote host");
(void) NetClose(net);
goto fail;
}

11
crypto/telnet/telnet/commands.c
View File

@ -2532,8 +2532,8 @@ tn(argc, argv)
goto fail;
}
}
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
do {
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
setuid(getuid());
if (net < 0) {
@ -2609,18 +2609,13 @@ tn(argc, argv)
if (af_error != 0)
while (next != NULL && next->ai_family != res->ai_family)
next = next->ai_next;
warn("connect to address %s", sockaddr_ntop(res->ai_addr));
if (next != NULL) {
int oerrno = errno;
fprintf(stderr, "telnet: connect to address %s: ",
sockaddr_ntop(res->ai_addr));
errno = oerrno;
perror((char *)0);
res = next;
(void) NetClose(net);
continue;
}
perror("telnet: Unable to connect to remote host");
warnx("Unable to connect to remote host");
(void) NetClose(net);
goto fail;
}

11
usr.bin/telnet/commands.c
View File

@ -2356,8 +2356,8 @@ tn(argc, argv)
goto fail;
}
}
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
do {
printf("Trying %s...\n", sockaddr_ntop(res->ai_addr));
net = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
setuid(getuid());
if (net < 0) {
@ -2433,18 +2433,13 @@ tn(argc, argv)
if (af_error != 0)
while (next != NULL && next->ai_family != res->ai_family)
next = next->ai_next;
warn("connect to address %s", sockaddr_ntop(res->ai_addr));
if (next != NULL) {
int oerrno = errno;
fprintf(stderr, "telnet: connect to address %s: ",
sockaddr_ntop(res->ai_addr));
errno = oerrno;
perror((char *)0);
res = next;
(void) NetClose(net);
continue;
}
perror("telnet: Unable to connect to remote host");
warnx("Unable to connect to remote host");
(void) NetClose(net);
goto fail;
}