nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-17 19:18:06 -05:00
Code Issues Projects Releases Wiki Activity

More use of sockaddr_union (above and beyond that necessary to remove current

Browse Source 
warnings).

[originally from svn r8613]
This commit is contained in:
Jacob Nevins 2009-08-06 22:55:15 +00:00
parent 16eeab4066
commit 9c1f81dd94
1 changed files with 55 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
unix/uxnet.c
View File

@ -43,6 +43,7 @@ union sockaddr_union {
#endif #endif
struct sockaddr sa; struct sockaddr sa;
struct sockaddr_in sin; struct sockaddr_in sin;
struct sockaddr_un su;
}; };
/* /*
@ -524,12 +525,8 @@ Socket sk_register(OSSocket sockfd, Plug plug)
static int try_connect(Actual_Socket sock) static int try_connect(Actual_Socket sock)
{ {
int s; int s;
#ifndef NO_IPV6 union sockaddr_union u;
struct sockaddr_in6 a6; const union sockaddr_union *sa;
#endif
struct sockaddr_in a;
struct sockaddr_un au;
const struct sockaddr *sa;
int err = 0; int err = 0;
short localport; short localport;
int fl, salen, family; int fl, salen, family;
@ -586,10 +583,7 @@ static int try_connect(Actual_Socket sock)
localport = 0; /* just use port 0 (ie kernel picks) */ localport = 0; /* just use port 0 (ie kernel picks) */
/* BSD IP stacks need sockaddr_in zeroed before filling in */ /* BSD IP stacks need sockaddr_in zeroed before filling in */
memset(&a,'\0',sizeof(struct sockaddr_in)); memset(&u,'\0',sizeof(u));
#ifndef NO_IPV6
memset(&a6,'\0',sizeof(struct sockaddr_in6));
#endif
/* We don't try to bind to a local address for UNIX domain sockets. (Why /* We don't try to bind to a local address for UNIX domain sockets. (Why
* do we bother doing the bind when localport == 0 anyway?) */ * do we bother doing the bind when localport == 0 anyway?) */
@ -601,18 +595,18 @@ static int try_connect(Actual_Socket sock)
#ifndef NO_IPV6 #ifndef NO_IPV6
if (family == AF_INET6) { if (family == AF_INET6) {
/* XXX use getaddrinfo to get a local address? */ /* XXX use getaddrinfo to get a local address? */
a6.sin6_family = AF_INET6; u.sin6.sin6_family = AF_INET6;
a6.sin6_addr = in6addr_any; u.sin6.sin6_addr = in6addr_any;
a6.sin6_port = htons(localport); u.sin6.sin6_port = htons(localport);
retcode = bind(s, (struct sockaddr *) &a6, sizeof(a6)); retcode = bind(s, &u.sa, sizeof(u.sin6));
} else } else
#endif #endif
{ {
assert(family == AF_INET); assert(family == AF_INET);
a.sin_family = AF_INET; u.sin.sin_family = AF_INET;
a.sin_addr.s_addr = htonl(INADDR_ANY); u.sin.sin_addr.s_addr = htonl(INADDR_ANY);
a.sin_port = htons(localport); u.sin.sin_port = htons(localport);
retcode = bind(s, (struct sockaddr *) &a, sizeof(a)); retcode = bind(s, &u.sa, sizeof(u.sin));
} }
if (retcode >= 0) { if (retcode >= 0) {
err = 0; err = 0;
@ -643,32 +637,31 @@ static int try_connect(Actual_Socket sock)
/* XXX would be better to have got getaddrinfo() to fill in the port. */ /* XXX would be better to have got getaddrinfo() to fill in the port. */
((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port = ((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port =
htons(sock->port); htons(sock->port);
sa = (const struct sockaddr *)sock->step.ai->ai_addr; sa = (const union sockaddr_union *)sock->step.ai->ai_addr;
salen = sock->step.ai->ai_addrlen; salen = sock->step.ai->ai_addrlen;
break; break;
case AF_INET6: case AF_INET6:
((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port = ((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port =
htons(sock->port); htons(sock->port);
sa = (const struct sockaddr *)sock->step.ai->ai_addr; sa = (const union sockaddr_union *)sock->step.ai->ai_addr;
salen = sock->step.ai->ai_addrlen; salen = sock->step.ai->ai_addrlen;
break; break;
#else #else
case AF_INET: case AF_INET:
a.sin_family = AF_INET; u.sin.sin_family = AF_INET;
a.sin_addr.s_addr = htonl(sock->addr->addresses[sock->step.curraddr]); u.sin.sin_addr.s_addr = htonl(sock->addr->addresses[sock->step.curraddr]);
a.sin_port = htons((short) sock->port); u.sin.sin_port = htons((short) sock->port);
sa = (const struct sockaddr *)&a; sa = &u;
salen = sizeof a; salen = sizeof u.sin;
break; break;
#endif #endif
case AF_UNIX: case AF_UNIX:
assert(sock->port == 0); /* to catch confused people */ assert(sock->port == 0); /* to catch confused people */
assert(strlen(sock->addr->hostname) < sizeof au.sun_path); assert(strlen(sock->addr->hostname) < sizeof u.su.sun_path);
memset(&au, 0, sizeof au); u.su.sun_family = AF_UNIX;
au.sun_family = AF_UNIX; strcpy(u.su.sun_path, sock->addr->hostname);
strcpy(au.sun_path, sock->addr->hostname); sa = &u;
sa = (const struct sockaddr *)&au; salen = sizeof u.su;
salen = sizeof au;
break; break;
default: default:
@ -680,7 +673,7 @@ static int try_connect(Actual_Socket sock)
if (fl != -1) if (fl != -1)
fcntl(s, F_SETFL, fl | O_NONBLOCK); fcntl(s, F_SETFL, fl | O_NONBLOCK);
if ((connect(s, sa, salen)) < 0) { if ((connect(s, &(sa->sa), salen)) < 0) {
if ( errno != EINPROGRESS ) { if ( errno != EINPROGRESS ) {
err = errno; err = errno;
goto ret; goto ret;
@ -758,11 +751,10 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
#ifndef NO_IPV6 #ifndef NO_IPV6
struct addrinfo hints, *ai; struct addrinfo hints, *ai;
char portstr[6]; char portstr[6];
struct sockaddr_in6 a6;
#endif #endif
struct sockaddr *addr; union sockaddr_union u;
union sockaddr_union *addr;
int addrlen; int addrlen;
struct sockaddr_in a;
Actual_Socket ret; Actual_Socket ret;
int retcode; int retcode;
int address_family; int address_family;
@ -847,52 +839,51 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i
sprintf(portstr, "%d", port); sprintf(portstr, "%d", port);
retcode = getaddrinfo(srcaddr, portstr, &hints, &ai); retcode = getaddrinfo(srcaddr, portstr, &hints, &ai);
if (retcode == 0) { if (retcode == 0) {
addr = ai->ai_addr; addr = (union sockaddr_union *)ai->ai_addr;
addrlen = ai->ai_addrlen; addrlen = ai->ai_addrlen;
} }
#else #else
memset(&a,'\0',sizeof(struct sockaddr_in)); memset(&u,'\0',sizeof u);
a.sin_family = AF_INET; u.sin.sin_family = AF_INET;
a.sin_port = htons(port); u.sin.sin_port = htons(port);
a.sin_addr.s_addr = inet_addr(srcaddr); u.sin.sin_addr.s_addr = inet_addr(srcaddr);
if (a.sin_addr.s_addr != (in_addr_t)(-1)) { if (u.sin.sin_addr.s_addr != (in_addr_t)(-1)) {
/* Override localhost_only with specified listen addr. */ /* Override localhost_only with specified listen addr. */
ret->localhost_only = ipv4_is_loopback(a.sin_addr); ret->localhost_only = ipv4_is_loopback(u.sin.sin_addr);
} }
addr = (struct sockaddr *)&a; addr = &u;
addrlen = sizeof(a); addrlen = sizeof(u.sin);
retcode = 0; retcode = 0;
#endif #endif
} }
if (retcode != 0) { if (retcode != 0) {
memset(&u,'\0',sizeof u);
#ifndef NO_IPV6 #ifndef NO_IPV6
if (address_family == AF_INET6) { if (address_family == AF_INET6) {
memset(&a6,'\0',sizeof(struct sockaddr_in6)); u.sin6.sin6_family = AF_INET6;
a6.sin6_family = AF_INET6; u.sin6.sin6_port = htons(port);
a6.sin6_port = htons(port);
if (local_host_only) if (local_host_only)
a6.sin6_addr = in6addr_loopback; u.sin6.sin6_addr = in6addr_loopback;
else else
a6.sin6_addr = in6addr_any; u.sin6.sin6_addr = in6addr_any;
addr = (struct sockaddr *)&a6; addr = &u;
addrlen = sizeof(a6); addrlen = sizeof(u.sin6);
} else } else
#endif #endif
{ {
memset(&a,'\0',sizeof(struct sockaddr_in)); u.sin.sin_family = AF_INET;
a.sin_family = AF_INET; u.sin.sin_port = htons(port);
a.sin_port = htons(port);
if (local_host_only) if (local_host_only)
a.sin_addr.s_addr = htonl(INADDR_LOOPBACK); u.sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
else else
a.sin_addr.s_addr = htonl(INADDR_ANY); u.sin.sin_addr.s_addr = htonl(INADDR_ANY);
addr = (struct sockaddr *)&a; addr = &u;
addrlen = sizeof(a); addrlen = sizeof(u.sin);
} }
} }
retcode = bind(s, addr, addrlen); retcode = bind(s, &addr->sa, addrlen);
if (retcode < 0) { if (retcode < 0) {
close(s); close(s);
ret->error = strerror(errno); ret->error = strerror(errno);
@ -1174,17 +1165,13 @@ static int net_select_result(int fd, int event)
* On a listening socket, the readability event means a * On a listening socket, the readability event means a
* connection is ready to be accepted. * connection is ready to be accepted.
*/ */
#ifdef NO_IPV6 union sockaddr_union su;
struct sockaddr_in ss; socklen_t addrlen = sizeof(su);
#else
struct sockaddr_storage ss;
#endif
socklen_t addrlen = sizeof(ss);
int t; /* socket of connection */ int t; /* socket of connection */
int fl; int fl;
memset(&ss, 0, addrlen); memset(&su, 0, addrlen);
t = accept(s->s, (struct sockaddr *)&ss, &addrlen); t = accept(s->s, &su.sa, &addrlen);
if (t < 0) { if (t < 0) {
break; break;
} }
@ -1194,7 +1181,7 @@ static int net_select_result(int fd, int event)
fcntl(t, F_SETFL, fl | O_NONBLOCK); fcntl(t, F_SETFL, fl | O_NONBLOCK);
if (s->localhost_only && if (s->localhost_only &&
!sockaddr_is_loopback((struct sockaddr *)&ss)) { !sockaddr_is_loopback(&su.sa)) {
close(t); /* someone let nonlocal through?! */ close(t); /* someone let nonlocal through?! */
} else if (plug_accepting(s->plug, t)) { } else if (plug_accepting(s->plug, t)) {
close(t); /* denied or error */ close(t); /* denied or error */