(tn): moved the printing of `trying...' to the loop

git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@4707 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1998-04-04 13:00:05 +00:00
parent 8afca2bb57
commit bde7e0c1d8

View File

@@ -2038,7 +2038,7 @@ tn(int argc, char **argv)
struct servent *sp = 0; struct servent *sp = 0;
unsigned long temp; unsigned long temp;
extern char *inet_ntoa(); extern char *inet_ntoa();
#if defined(IP_OPTIONS) && defined(IPPROTO_IP) #if defined(IP_OPTIONS) && defined(IPPROTO_IP)
char *srp = 0; char *srp = 0;
int srlen; int srlen;
#endif #endif
@@ -2219,34 +2219,35 @@ tn(int argc, char **argv)
} }
telnetport = 1; telnetport = 1;
} }
switch(family) { do {
case AF_INET: switch(family) {
sin.sin_port = port; case AF_INET:
printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr)); sin.sin_port = port;
break; printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
break;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
case AF_INET6: { case AF_INET6: {
#ifndef INET6_ADDRSTRLEN #ifndef INET6_ADDRSTRLEN
#define INET6_ADDRSTRLEN 46 #define INET6_ADDRSTRLEN 46
#endif #endif
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
sin6.sin6_port = port; sin6.sin6_port = port;
#ifdef HAVE_INET_NTOP #ifdef HAVE_INET_NTOP
printf("Trying %s...\r\n", inet_ntop(AF_INET6, printf("Trying %s...\r\n", inet_ntop(AF_INET6,
&sin6.sin6_addr, &sin6.sin6_addr,
buf, buf,
sizeof(buf))); sizeof(buf)));
#endif #endif
break; break;
} }
#endif #endif
default: default:
abort(); abort();
} }
do {
net = socket(family, SOCK_STREAM, 0); net = socket(family, SOCK_STREAM, 0);
setuid(getuid()); setuid(getuid());
if (net < 0) { if (net < 0) {