nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 01:02:24 +00:00
Code Issues Projects Releases Wiki Activity

windows/network.c: refactor SOCKADDR_FAMILY.

Browse Source 
This macro is now an inline function, and as in the previous commit,
each possible value for the main discriminator is now a case in a
switch statement instead of tested in an interlocking set of ?:.
This commit is contained in:
Simon Tatham 2022-01-27 20:32:27 +00:00
parent 5b5904b7cc
commit 04cc999b50
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
windows/network.c
View File

@ -111,14 +111,19 @@ struct SockAddr {
* not been done and a simple host name is held in this SockAddr * not been done and a simple host name is held in this SockAddr
* structure. * structure.
*/ */
static inline int sockaddr_family(SockAddr *addr, SockAddrStep step)
{
switch (addr->superfamily) {
case IP:
#ifndef NO_IPV6 #ifndef NO_IPV6
#define SOCKADDR_FAMILY(addr, step) \ if (step.ai)
((addr)->superfamily != IP ? AF_UNSPEC : \ return step.ai->ai_family;
(step).ai ? (step).ai->ai_family : AF_INET)
#else
#define SOCKADDR_FAMILY(addr, step) \
((addr)->superfamily != IP ? AF_UNSPEC : AF_INET)
#endif #endif
return AF_INET;
default:
return AF_UNSPEC;
}
}
/* /*
* Start a SockAddrStep structure to step through multiple * Start a SockAddrStep structure to step through multiple
@ -622,7 +627,7 @@ void sk_getaddr(SockAddr *addr, char *buf, int buflen)
} }
} else } else
#endif #endif
if (SOCKADDR_FAMILY(addr, step) == AF_INET) { if (sockaddr_family(addr, step) == AF_INET) {
struct in_addr a; struct in_addr a;
assert(addr->addresses && step.curraddr < addr->naddresses); assert(addr->addresses && step.curraddr < addr->naddresses);
a.s_addr = p_htonl(addr->addresses[step.curraddr]); a.s_addr = p_htonl(addr->addresses[step.curraddr]);
@ -653,7 +658,7 @@ static SockAddr sk_extractaddr_tmp(
#ifndef NO_IPV6 #ifndef NO_IPV6
toret.ais = step->ai; toret.ais = step->ai;
#endif #endif
if (SOCKADDR_FAMILY(addr, *step) == AF_INET if (sockaddr_family(addr, *step) == AF_INET
#ifndef NO_IPV6 #ifndef NO_IPV6
&& !toret.ais && !toret.ais
#endif #endif
@ -713,7 +718,7 @@ bool sk_address_is_local(SockAddr *addr)
SockAddrStep step; SockAddrStep step;
int family; int family;
START_STEP(addr, step); START_STEP(addr, step);
family = SOCKADDR_FAMILY(addr, step); family = sockaddr_family(addr, step);
#ifndef NO_IPV6 #ifndef NO_IPV6
if (family == AF_INET6) { if (family == AF_INET6) {
@ -749,7 +754,7 @@ int sk_addrtype(SockAddr *addr)
SockAddrStep step; SockAddrStep step;
int family; int family;
START_STEP(addr, step); START_STEP(addr, step);
family = SOCKADDR_FAMILY(addr, step); family = sockaddr_family(addr, step);
return (family == AF_INET ? ADDRTYPE_IPV4 : return (family == AF_INET ? ADDRTYPE_IPV4 :
#ifndef NO_IPV6 #ifndef NO_IPV6
@ -763,7 +768,7 @@ void sk_addrcopy(SockAddr *addr, char *buf)
SockAddrStep step; SockAddrStep step;
int family; int family;
START_STEP(addr, step); START_STEP(addr, step);
family = SOCKADDR_FAMILY(addr, step); family = sockaddr_family(addr, step);
assert(family != AF_UNSPEC); assert(family != AF_UNSPEC);
#ifndef NO_IPV6 #ifndef NO_IPV6
@ -907,7 +912,7 @@ static DWORD try_connect(NetSocket *sock)
/* /*
* Open socket. * Open socket.
*/ */
family = SOCKADDR_FAMILY(sock->addr, sock->step); family = sockaddr_family(sock->addr, sock->step);
/* /*
* Remove the socket from the tree before we overwrite its * Remove the socket from the tree before we overwrite its