#include "network.h"
#include "tree234.h"
+/* Solaris needs <sys/sockio.h> for SIOCATMARK. */
+#ifndef SIOCATMARK
+#include <sys/sockio.h>
+#endif
+
#ifndef X11_UNIX_PATH
# 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 */
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);
return -1;
if (as > bs)
return +1;
+ if (a < b)
+ return -1;
+ if (a > b)
+ return +1;
return 0;
}
/* 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;
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
* 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" :
* 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';
{
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
#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->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;
void sk_getaddr(SockAddr addr, char *buf, int buflen)
{
-
- if (addr->family == AF_UNSPEC) {
+ /* XXX not clear what we should return for Unix-domain sockets; let's
+ * hope the question never arises */
+ assert(addr->superfamily != UNIX);
+ 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, "<unknown>", 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
int sk_hostname_is_local(char *name)
{
- return !strcmp(name, "localhost");
+ return !strcmp(name, "localhost") ||
+ !strcmp(name, "::1") ||
+ !strncmp(name, "127.", 4);
}
#define ipv4_is_loopback(addr) \
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 if (addr->superfamily == UNIX)
+ return 1;
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
}
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);
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;
ret->pending_error = 0;
ret->oobpending = FALSE;
ret->listener = 0;
+ ret->parent = ret->child = NULL;
ret->addr = NULL;
ret->connected = 1;
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
+ * internal socket id, because that forms part of the tree's
+ * sorting criterion. We'll add it back before exiting this
+ * function, whether we changed anything or not.
+ */
+ del234(sktree, sock);
if (sock->s >= 0)
close(sock->s);
/*
* 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) {
goto ret;
}
+ cloexec(s);
+
if (sock->oobinline) {
int b = TRUE;
setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b));
/* 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;
} 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);
/*
* 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;
default:
assert(0 && "unknown address family");
+ exit(1); /* XXX: GCC doesn't understand assert() on some systems. */
}
fl = fcntl(s, F_GETFL);
}
uxsel_tell(sock);
- add234(sktree, sock);
ret:
+
+ /*
+ * No matter what happened, put the socket back in the tree.
+ */
+ add234(sktree, sock);
+
if (err)
plug_log(sock->plug, 1, sock->addr, sock->port, strerror(err), err);
return err;
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;
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);
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
struct sockaddr_in a;
Actual_Socket ret;
int retcode;
+ int address_family;
int on = 1;
/*
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;
* Translate address_family from platform-independent constants
* into local reality.
*/
- address_family = (address_family == ADDRTYPE_IPV4 ? AF_INET :
- address_family == ADDRTYPE_IPV6 ? AF_INET6 : AF_UNSPEC);
+ address_family = (orig_address_family == ADDRTYPE_IPV4 ? AF_INET :
+#ifndef NO_IPV6
+ orig_address_family == ADDRTYPE_IPV6 ? AF_INET6 :
+#endif
+ AF_UNSPEC);
#ifndef NO_IPV6
/* Let's default to IPv6.
*/
s = socket(address_family, SOCK_STREAM, 0);
+#ifndef NO_IPV6
/* If the host doesn't support IPv6 try fallback to IPv4. */
if (s < 0 && address_family == AF_INET6) {
address_family = AF_INET;
s = socket(address_family, SOCK_STREAM, 0);
}
+#endif
if (s < 0) {
ret->error = strerror(errno);
return (Socket) ret;
}
+ cloexec(s);
+
ret->oobinline = 0;
setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (const char *)&on, sizeof(on));
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);
{
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);
sfree(s);
}
-#define PUT_32BIT_MSB_FIRST(cp, value) ( \
- (cp)[0] = (char)((value) >> 24), \
- (cp)[1] = (char)((value) >> 16), \
- (cp)[2] = (char)((value) >> 8), \
- (cp)[3] = (char)(value) )
-
-#define PUT_16BIT_MSB_FIRST(cp, value) ( \
- (cp)[0] = (char)((value) >> 8), \
- (cp)[1] = (char)(value) )
-
void *sk_getxdmdata(void *sock, int *lenp)
{
Actual_Socket s = (Actual_Socket) sock;
#endif
socklen_t addrlen = sizeof(ss);
int t; /* socket of connection */
+ int fl;
memset(&ss, 0, addrlen);
t = accept(s->s, (struct sockaddr *)&ss, &addrlen);
break;
}
+ fl = fcntl(t, F_GETFL);
+ if (fl != -1)
+ fcntl(t, F_SETFL, fl | O_NONBLOCK);
+
if (s->localhost_only &&
!sockaddr_is_loopback((struct sockaddr *)&ss)) {
close(t); /* someone let nonlocal through?! */
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);
}
}
return 0;
}
-SockAddr platform_get_x11_unix_address(int displaynum, char **canonicalname)
+char *get_hostname(void)
+{
+ int len = 128;
+ char *hostname = NULL;
+ do {
+ len *= 2;
+ hostname = sresize(hostname, len, char);
+ if ((gethostname(hostname, len) < 0) &&
+ (errno != ENAMETOOLONG)) {
+ sfree(hostname);
+ hostname = NULL;
+ break;
+ }
+ } while (strlen(hostname) >= len-1);
+ return hostname;
+}
+
+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->ais = NULL;
#else
ret->addresses = NULL;
+ ret->naddresses = 0;
#endif
+ ret->refcount = 1;
return ret;
}