oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

HAVE_SOCKADDR_IN6 -> HAVE_STRUCT_SOCKADDR_IN6

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@3509 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-09-21 13:20:23 +00:00
parent 0f544550ad
commit 378c0ebc44
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
appl/telnet/telnet/commands.c
View File

@@ -2029,7 +2029,7 @@ int
tn(int argc, char **argv) tn(int argc, char **argv)
{ {
struct hostent *host = 0; struct hostent *host = 0;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
#endif #endif
struct sockaddr_in sin; struct sockaddr_in sin;
@@ -2121,7 +2121,7 @@ tn(int argc, char **argv)
} else { } else {
#endif #endif
memset (&sin, 0, sizeof(sin)); memset (&sin, 0, sizeof(sin));
#if defined(HAVE_INET_PTON) && defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(HAVE_INET_PTON) && defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
memset (&sin6, 0, sizeof(sin6)); memset (&sin6, 0, sizeof(sin6));
if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) { if(inet_pton(AF_INET6, hostp, &sin6.sin6_addr)) {
@@ -2154,7 +2154,7 @@ tn(int argc, char **argv)
sin.sin_family = family; sin.sin_family = family;
sin.sin_addr = *((struct in_addr *)(*host->h_addr_list)); sin.sin_addr = *((struct in_addr *)(*host->h_addr_list));
break; break;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
case AF_INET6: case AF_INET6:
memset(&sin6, 0, sizeof(sin6)); memset(&sin6, 0, sizeof(sin6));
sa_size = sizeof(sin6); sa_size = sizeof(sin6);
@@ -2220,7 +2220,7 @@ tn(int argc, char **argv)
sin.sin_port = port; sin.sin_port = port;
printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr)); printf("Trying %s...\r\n", inet_ntoa(sin.sin_addr));
break; break;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
case AF_INET6: { case AF_INET6: {
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];
@@ -2281,7 +2281,7 @@ tn(int argc, char **argv)
inet_ntoa(sin.sin_addr)); inet_ntoa(sin.sin_addr));
sin.sin_addr = *((struct in_addr *)(*++host->h_addr_list)); sin.sin_addr = *((struct in_addr *)(*++host->h_addr_list));
break; break;
#if defined(AF_INET6) && defined(HAVE_SOCKADDR_IN6) #if defined(AF_INET6) && defined(HAVE_STRUCT_SOCKADDR_IN6)
case AF_INET6: { case AF_INET6: {
char buf[INET6_ADDRSTRLEN]; char buf[INET6_ADDRSTRLEN];