X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/068ba98ca54170b084721df9f7f8ec8d897714f5..8def70c3ec6f81f95673c0de67a75b5a6b2e9e1c:/unix/uxnet.c diff --git a/unix/uxnet.c b/unix/uxnet.c index bd40937a..c0f24719 100644 --- a/unix/uxnet.c +++ b/unix/uxnet.c @@ -31,6 +31,29 @@ # define X11_UNIX_PATH "/tmp/.X11-unix/X" #endif +/* + * We used to typedef struct Socket_tag *Socket. + * + * Since we have made the networking abstraction slightly more + * abstract, Socket no longer means a tcp socket (it could mean + * an ssl socket). So now we must use Actual_Socket when we know + * we are talking about a tcp socket. + */ +typedef struct Socket_tag *Actual_Socket; + +/* + * Mutable state that goes with a SockAddr: stores information + * about where in the list of candidate IP(v*) addresses we've + * currently got to. + */ +typedef struct SockAddrStep_tag SockAddrStep; +struct SockAddrStep_tag { +#ifndef NO_IPV6 + struct addrinfo *ai; /* steps along addr->ais */ +#endif + int curraddr; +}; + struct Socket_tag { struct socket_function_table *fn; /* the above variable absolutely *must* be the first in this structure */ @@ -54,37 +77,58 @@ struct Socket_tag { int nodelay, keepalive; /* for connect()-type sockets */ int privport, port; /* and again */ SockAddr addr; + SockAddrStep step; + /* + * We sometimes need pairs of Socket structures to be linked: + * if we are listening on the same IPv6 and v4 port, for + * example. So here we define `parent' and `child' pointers to + * track this link. + */ + Actual_Socket parent, child; }; -/* - * We used to typedef struct Socket_tag *Socket. - * - * Since we have made the networking abstraction slightly more - * abstract, Socket no longer means a tcp socket (it could mean - * an ssl socket). So now we must use Actual_Socket when we know - * we are talking about a tcp socket. - */ -typedef struct Socket_tag *Actual_Socket; - struct SockAddr_tag { + int refcount; const char *error; - /* - * Which address family this address belongs to. AF_INET for - * IPv4; AF_INET6 for IPv6; AF_UNSPEC indicates that name - * resolution has not been done and a simple host name is held - * in this SockAddr structure. - */ - int family; + enum { UNRESOLVED, UNIX, IP } superfamily; #ifndef NO_IPV6 struct addrinfo *ais; /* Addresses IPv6 style. */ - struct addrinfo *ai; /* steps along the linked list */ #else unsigned long *addresses; /* Addresses IPv4 style. */ - int naddresses, curraddr; + int naddresses; #endif char hostname[512]; /* Store an unresolved host name. */ }; +/* + * Which address family this address belongs to. AF_INET for IPv4; + * AF_INET6 for IPv6; AF_UNSPEC indicates that name resolution has + * not been done and a simple host name is held in this SockAddr + * structure. + */ +#ifndef NO_IPV6 +#define SOCKADDR_FAMILY(addr, step) \ + ((addr)->superfamily == UNRESOLVED ? AF_UNSPEC : \ + (addr)->superfamily == UNIX ? AF_UNIX : \ + (step).ai ? (step).ai->ai_family : AF_INET) +#else +#define SOCKADDR_FAMILY(addr, step) \ + ((addr)->superfamily == UNRESOLVED ? AF_UNSPEC : \ + (addr)->superfamily == UNIX ? AF_UNIX : AF_INET) +#endif + +/* + * Start a SockAddrStep structure to step through multiple + * addresses. + */ +#ifndef NO_IPV6 +#define START_STEP(addr, step) \ + ((step).ai = (addr)->ais, (step).curraddr = 0) +#else +#define START_STEP(addr, step) \ + ((step).curraddr = 0) +#endif + static tree234 *sktree; static void uxsel_tell(Actual_Socket s); @@ -147,9 +191,10 @@ SockAddr sk_namelookup(const char *host, char **canonicalname, int address_famil /* Clear the structure and default to IPv4. */ memset(ret, 0, sizeof(struct SockAddr_tag)); - ret->family = 0; /* We set this one when we have resolved the host. */ + ret->superfamily = UNRESOLVED; *realhost = '\0'; ret->error = NULL; + ret->refcount = 1; #ifndef NO_IPV6 hints.ai_flags = AI_CANONNAME; @@ -163,15 +208,14 @@ SockAddr sk_namelookup(const char *host, char **canonicalname, int address_famil hints.ai_canonname = NULL; hints.ai_next = NULL; err = getaddrinfo(host, NULL, &hints, &ret->ais); - ret->ai = ret->ais; if (err != 0) { ret->error = gai_strerror(err); return ret; } - ret->family = ret->ai->ai_family; + ret->superfamily = IP; *realhost = '\0'; - if (ret->ai->ai_canonname != NULL) - strncat(realhost, ret->ai->ai_canonname, sizeof(realhost) - 1); + if (ret->ais->ai_canonname != NULL) + strncat(realhost, ret->ais->ai_canonname, sizeof(realhost) - 1); else strncat(realhost, host, sizeof(realhost) - 1); #else @@ -180,12 +224,12 @@ SockAddr sk_namelookup(const char *host, char **canonicalname, int address_famil * Otherwise use the IPv4-only gethostbyname... (NOTE: * we don't use gethostbyname as a fallback!) */ - if (ret->family == 0) { + if (ret->superfamily == UNRESOLVED) { /*debug(("Resolving \"%s\" with gethostbyname() (IPv4 only)...\n", host)); */ if ( (h = gethostbyname(host)) ) - ret->family = AF_INET; + ret->superfamily = IP; } - if (ret->family == 0) { + if (ret->superfamily == UNRESOLVED) { ret->error = (h_errno == HOST_NOT_FOUND || h_errno == NO_DATA || h_errno == NO_ADDRESS ? "Host does not exist" : @@ -208,12 +252,11 @@ SockAddr sk_namelookup(const char *host, char **canonicalname, int address_famil * This must be a numeric IPv4 address because it caused a * success return from inet_addr. */ - ret->family = AF_INET; + ret->superfamily = IP; strncpy(realhost, host, sizeof(realhost)); ret->addresses = snew(unsigned long); ret->naddresses = 1; ret->addresses[0] = ntohl(a); - ret->curraddr = 0; } #endif realhost[lenof(realhost)-1] = '\0'; @@ -226,7 +269,7 @@ SockAddr sk_nonamelookup(const char *host) { SockAddr ret = snew(struct SockAddr_tag); ret->error = NULL; - ret->family = AF_UNSPEC; + ret->superfamily = UNRESOLVED; strncpy(ret->hostname, host, lenof(ret->hostname)); ret->hostname[lenof(ret->hostname)-1] = '\0'; #ifndef NO_IPV6 @@ -234,21 +277,21 @@ SockAddr sk_nonamelookup(const char *host) #else ret->addresses = NULL; #endif + ret->refcount = 1; return ret; } -static int sk_nextaddr(SockAddr addr) +static int sk_nextaddr(SockAddr addr, SockAddrStep *step) { #ifndef NO_IPV6 - if (addr->ai && addr->ai->ai_next) { - addr->ai = addr->ai->ai_next; - addr->family = addr->ai->ai_family; + if (step->ai && step->ai->ai_next) { + step->ai = step->ai->ai_next; return TRUE; } else return FALSE; #else - if (addr->curraddr+1 < addr->naddresses) { - addr->curraddr++; + if (step->curraddr+1 < addr->naddresses) { + step->curraddr++; return TRUE; } else { return FALSE; @@ -259,20 +302,22 @@ static int sk_nextaddr(SockAddr addr) void sk_getaddr(SockAddr addr, char *buf, int buflen) { - if (addr->family == AF_UNSPEC) { + if (addr->superfamily == UNRESOLVED) { strncpy(buf, addr->hostname, buflen); buf[buflen-1] = '\0'; } else { #ifndef NO_IPV6 - if (getnameinfo(addr->ai->ai_addr, addr->ai->ai_addrlen, buf, buflen, + if (getnameinfo(addr->ais->ai_addr, addr->ais->ai_addrlen, buf, buflen, NULL, 0, NI_NUMERICHOST) != 0) { buf[0] = '\0'; strncat(buf, "", buflen - 1); } #else struct in_addr a; - assert(addr->family == AF_INET); - a.s_addr = htonl(addr->addresses[addr->curraddr]); + SockAddrStep step; + START_STEP(addr, step); + assert(SOCKADDR_FAMILY(addr, step) == AF_INET); + a.s_addr = htonl(addr->addresses[0]); strncpy(buf, inet_ntoa(a), buflen); buf[buflen-1] = '\0'; #endif @@ -313,15 +358,17 @@ static int sockaddr_is_loopback(struct sockaddr *sa) int sk_address_is_local(SockAddr addr) { - if (addr->family == AF_UNSPEC) + if (addr->superfamily == UNRESOLVED) return 0; /* we don't know; assume not */ else { #ifndef NO_IPV6 - return sockaddr_is_loopback(addr->ai->ai_addr); + return sockaddr_is_loopback(addr->ais->ai_addr); #else struct in_addr a; - assert(addr->family == AF_INET); - a.s_addr = htonl(addr->addresses[addr->curraddr]); + SockAddrStep step; + START_STEP(addr, step); + assert(SOCKADDR_FAMILY(addr, step) == AF_INET); + a.s_addr = htonl(addr->addresses[0]); return ipv4_is_loopback(a); #endif } @@ -329,37 +376,47 @@ int sk_address_is_local(SockAddr addr) int sk_addrtype(SockAddr addr) { - return (addr->family == AF_INET ? ADDRTYPE_IPV4 : + SockAddrStep step; + int family; + START_STEP(addr, step); + family = SOCKADDR_FAMILY(addr, step); + + return (family == AF_INET ? ADDRTYPE_IPV4 : #ifndef NO_IPV6 - addr->family == AF_INET6 ? ADDRTYPE_IPV6 : + family == AF_INET6 ? ADDRTYPE_IPV6 : #endif ADDRTYPE_NAME); } void sk_addrcopy(SockAddr addr, char *buf) { + SockAddrStep step; + int family; + START_STEP(addr, step); + family = SOCKADDR_FAMILY(addr, step); #ifndef NO_IPV6 - if (addr->family == AF_INET) - memcpy(buf, &((struct sockaddr_in *)addr->ai->ai_addr)->sin_addr, + if (family == AF_INET) + memcpy(buf, &((struct sockaddr_in *)step.ai->ai_addr)->sin_addr, sizeof(struct in_addr)); - else if (addr->family == AF_INET6) - memcpy(buf, &((struct sockaddr_in6 *)addr->ai->ai_addr)->sin6_addr, + else if (family == AF_INET6) + memcpy(buf, &((struct sockaddr_in6 *)step.ai->ai_addr)->sin6_addr, sizeof(struct in6_addr)); else assert(FALSE); #else struct in_addr a; - assert(addr->family == AF_INET); - a.s_addr = htonl(addr->addresses[addr->curraddr]); + assert(family == AF_INET); + a.s_addr = htonl(addr->addresses[step.curraddr]); memcpy(buf, (char*) &a.s_addr, 4); #endif } void sk_addr_free(SockAddr addr) { - + if (--addr->refcount > 0) + return; #ifndef NO_IPV6 if (addr->ais != NULL) freeaddrinfo(addr->ais); @@ -369,6 +426,12 @@ void sk_addr_free(SockAddr addr) sfree(addr); } +SockAddr sk_addr_dup(SockAddr addr) +{ + addr->refcount++; + return addr; +} + static Plug sk_tcp_plug(Socket sock, Plug p) { Actual_Socket s = (Actual_Socket) sock; @@ -426,6 +489,7 @@ Socket sk_register(OSSocket sockfd, Plug plug) ret->pending_error = 0; ret->oobpending = FALSE; ret->listener = 0; + ret->parent = ret->child = NULL; ret->addr = NULL; ret->connected = 1; @@ -455,7 +519,7 @@ static int try_connect(Actual_Socket sock) const struct sockaddr *sa; int err = 0; short localport; - int fl, salen; + int fl, salen, family; /* * Remove the socket from the tree before we overwrite its @@ -473,8 +537,9 @@ static int try_connect(Actual_Socket sock) /* * Open socket. */ - assert(sock->addr->family != AF_UNSPEC); - s = socket(sock->addr->family, SOCK_STREAM, 0); + family = SOCKADDR_FAMILY(sock->addr, sock->step); + assert(family != AF_UNSPEC); + s = socket(family, SOCK_STREAM, 0); sock->s = s; if (s < 0) { @@ -515,13 +580,13 @@ static int try_connect(Actual_Socket sock) /* 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?) */ - if(sock->addr->family != AF_UNIX) { + if (family != AF_UNIX) { /* Loop round trying to bind */ while (1) { int retcode; #ifndef NO_IPV6 - if (sock->addr->family == AF_INET6) { + if (family == AF_INET6) { /* XXX use getaddrinfo to get a local address? */ a6.sin6_family = AF_INET6; a6.sin6_addr = in6addr_any; @@ -530,7 +595,7 @@ static int try_connect(Actual_Socket sock) } else #endif { - assert(sock->addr->family == AF_INET); + assert(family == AF_INET); a.sin_family = AF_INET; a.sin_addr.s_addr = htonl(INADDR_ANY); a.sin_port = htons(localport); @@ -559,25 +624,25 @@ static int try_connect(Actual_Socket sock) /* * Connect to remote address. */ - switch(sock->addr->family) { + switch(family) { #ifndef NO_IPV6 case AF_INET: /* XXX would be better to have got getaddrinfo() to fill in the port. */ - ((struct sockaddr_in *)sock->addr->ai->ai_addr)->sin_port = + ((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port = htons(sock->port); - sa = (const struct sockaddr *)sock->addr->ai->ai_addr; - salen = sock->addr->ai->ai_addrlen; + sa = (const struct sockaddr *)sock->step.ai->ai_addr; + salen = sock->step.ai->ai_addrlen; break; case AF_INET6: - ((struct sockaddr_in *)sock->addr->ai->ai_addr)->sin_port = + ((struct sockaddr_in *)sock->step.ai->ai_addr)->sin_port = htons(sock->port); - sa = (const struct sockaddr *)sock->addr->ai->ai_addr; - salen = sock->addr->ai->ai_addrlen; + sa = (const struct sockaddr *)sock->step.ai->ai_addr; + salen = sock->step.ai->ai_addrlen; break; #else case AF_INET: a.sin_family = AF_INET; - a.sin_addr.s_addr = htonl(sock->addr->addresses[sock->addr->curraddr]); + a.sin_addr.s_addr = htonl(sock->addr->addresses[sock->step.curraddr]); a.sin_port = htons((short) sock->port); sa = (const struct sockaddr *)&a; salen = sizeof a; @@ -651,9 +716,11 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, ret->frozen_readable = 0; ret->localhost_only = 0; /* unused, but best init anyway */ ret->pending_error = 0; + ret->parent = ret->child = NULL; ret->oobpending = FALSE; ret->listener = 0; ret->addr = addr; + START_STEP(ret->addr, ret->step); ret->s = -1; ret->oobinline = oobinline; ret->nodelay = nodelay; @@ -664,7 +731,7 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, err = 0; do { err = try_connect(ret); - } while (err && sk_nextaddr(ret->addr)); + } while (err && sk_nextaddr(ret->addr, &ret->step)); if (err) ret->error = strerror(err); @@ -672,7 +739,7 @@ Socket sk_new(SockAddr addr, int port, int privport, int oobinline, return (Socket) ret; } -Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, int address_family) +Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, int orig_address_family) { int s; #ifndef NO_IPV6 @@ -685,6 +752,7 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i struct sockaddr_in a; Actual_Socket ret; int retcode; + int address_family; int on = 1; /* @@ -701,6 +769,7 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i ret->frozen_readable = 0; ret->localhost_only = local_host_only; ret->pending_error = 0; + ret->parent = ret->child = NULL; ret->oobpending = FALSE; ret->listener = 1; ret->addr = NULL; @@ -709,9 +778,9 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i * Translate address_family from platform-independent constants * into local reality. */ - address_family = (address_family == ADDRTYPE_IPV4 ? AF_INET : + address_family = (orig_address_family == ADDRTYPE_IPV4 ? AF_INET : #ifndef NO_IPV6 - address_family == ADDRTYPE_IPV6 ? AF_INET6 : + orig_address_family == ADDRTYPE_IPV6 ? AF_INET6 : #endif AF_UNSPEC); @@ -823,6 +892,32 @@ Socket sk_newlistener(char *srcaddr, int port, Plug plug, int local_host_only, i return (Socket) ret; } +#ifndef NO_IPV6 + /* + * If we were given ADDRTYPE_UNSPEC, we must also create an + * IPv4 listening socket and link it to this one. + */ + if (address_family == AF_INET6 && orig_address_family == ADDRTYPE_UNSPEC) { + Actual_Socket other; + + other = (Actual_Socket) sk_newlistener(srcaddr, port, plug, + local_host_only, ADDRTYPE_IPV4); + + if (other) { + if (!other->error) { + other->parent = ret; + ret->child = other; + } else { + /* If we couldn't create a listening socket on IPv4 as well + * as IPv6, we must return an error overall. */ + close(s); + sfree(ret); + return (Socket) other; + } + } + } +#endif + ret->s = s; uxsel_tell(ret); @@ -835,6 +930,9 @@ static void sk_tcp_close(Socket sock) { Actual_Socket s = (Actual_Socket) sock; + if (s->child) + sk_tcp_close((Socket)s->child); + uxsel_del(s->s); del234(sktree, s); close(s->s); @@ -1139,7 +1237,7 @@ static int net_select_result(int fd, int event) int err = errno; if (s->addr) { plug_log(s->plug, 1, s->addr, s->port, strerror(err), err); - while (s->addr && sk_nextaddr(s->addr)) { + while (s->addr && sk_nextaddr(s->addr, &s->step)) { err = try_connect(s); } } @@ -1292,26 +1390,36 @@ int net_service_lookup(char *service) return 0; } -SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname) +SockAddr platform_get_x11_unix_address(const char *sockpath, int displaynum) { SockAddr ret = snew(struct SockAddr_tag); int n; memset(ret, 0, sizeof *ret); - ret->family = AF_UNIX; - n = snprintf(ret->hostname, sizeof ret->hostname, - "%s%d", X11_UNIX_PATH, displaynum); - if(n < 0) + ret->superfamily = UNIX; + /* + * In special circumstances (notably Mac OS X Leopard), we'll + * have been passed an explicit Unix socket path. + */ + if (sockpath) { + n = snprintf(ret->hostname, sizeof ret->hostname, + "%s", sockpath); + } else { + n = snprintf(ret->hostname, sizeof ret->hostname, + "%s%d", X11_UNIX_PATH, displaynum); + } + + if (n < 0) ret->error = "snprintf failed"; - else if(n >= sizeof ret->hostname) + else if (n >= sizeof ret->hostname) ret->error = "X11 UNIX name too long"; - else - *canonicalname = dupstr(ret->hostname); + #ifndef NO_IPV6 - ret->ai = ret->ais = NULL; + ret->ais = NULL; #else ret->addresses = NULL; - ret->curraddr = ret->naddresses = 0; + ret->naddresses = 0; #endif + ret->refcount = 1; return ret; }