#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
Plug plug;
void *private_ptr;
bufchain output_data;
- int connected;
+ int connected; /* irrelevant for listening sockets */
int writable;
int frozen; /* this causes readability notifications to be ignored */
int frozen_readable; /* this means we missed at least one readability
return -1;
if (as > bs)
return +1;
+ if (a < b)
+ return -1;
+ if (a > b)
+ return +1;
return 0;
}
static int sk_nextaddr(SockAddr addr)
{
#ifndef NO_IPV6
- if (addr->ai->ai_next) {
+ if (addr->ai && addr->ai->ai_next) {
addr->ai = addr->ai->ai_next;
addr->family = addr->ai->ai_family;
return TRUE;
sin6 = (struct sockaddr_in6 *)sa;
return IN6_IS_ADDR_LOOPBACK(&sin6->sin6_addr);
#endif
- case AF_LOCAL:
+ case AF_UNIX:
return TRUE;
default:
return FALSE;
ret->oobpending = FALSE;
ret->listener = 0;
ret->addr = NULL;
+ ret->connected = 1;
ret->s = sockfd;
short localport;
int fl, salen;
+ /*
+ * 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);
goto ret;
}
+ cloexec(s);
+
if (sock->oobinline) {
int b = TRUE;
setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b));
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;
* into local reality.
*/
address_family = (address_family == ADDRTYPE_IPV4 ? AF_INET :
- address_family == ADDRTYPE_IPV6 ? AF_INET6 : AF_UNSPEC);
+#ifndef NO_IPV6
+ 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));
if (a.sin_addr.s_addr != (in_addr_t)(-1)) {
/* Override localhost_only with specified listen addr. */
ret->localhost_only = ipv4_is_loopback(a.sin_addr);
- got_addr = 1;
}
- addr = (struct sockaddr *)a;
+ addr = (struct sockaddr *)&a;
addrlen = sizeof(a);
retcode = 0;
#endif
sfree(s);
}
-int sk_getxdmdata(void *sock, unsigned long *ip, int *port)
+void *sk_getxdmdata(void *sock, int *lenp)
{
Actual_Socket s = (Actual_Socket) sock;
+#ifdef NO_IPV6
struct sockaddr_in addr;
+#else
+ struct sockaddr_storage addr;
+ struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
+#endif
+ struct sockaddr *sa = (struct sockaddr *)&addr;
+ struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
socklen_t addrlen;
+ char *buf;
+ static unsigned int unix_addr = 0xFFFFFFFF;
/*
* We must check that this socket really _is_ an Actual_Socket.
*/
if (s->fn != &tcp_fn_table)
- return 0; /* failure */
+ return NULL; /* failure */
addrlen = sizeof(addr);
- if (getsockname(s->s, (struct sockaddr *)&addr, &addrlen) < 0)
- return 0;
- switch(addr.sin_family) {
+ if (getsockname(s->s, sa, &addrlen) < 0)
+ return NULL;
+ switch(sa->sa_family) {
case AF_INET:
- *ip = ntohl(addr.sin_addr.s_addr);
- *port = ntohs(addr.sin_port);
+ *lenp = 6;
+ buf = snewn(*lenp, char);
+ PUT_32BIT_MSB_FIRST(buf, ntohl(sin->sin_addr.s_addr));
+ PUT_16BIT_MSB_FIRST(buf+4, ntohs(sin->sin_port));
break;
+#ifndef NO_IPV6
+ case AF_INET6:
+ *lenp = 6;
+ buf = snewn(*lenp, char);
+ if (IN6_IS_ADDR_V4MAPPED(&sin6->sin6_addr)) {
+ memcpy(buf, sin6->sin6_addr.s6_addr + 12, 4);
+ PUT_16BIT_MSB_FIRST(buf+4, ntohs(sin6->sin6_port));
+ } else
+ /* This is stupid, but it's what XLib does. */
+ memset(buf, 0, 6);
+ break;
+#endif
case AF_UNIX:
- /*
- * For a Unix socket, we return 0xFFFFFFFF for the IP address and
- * our current pid for the port. Bizarre, but such is life.
- */
- *ip = ntohl(0xFFFFFFFF);
- *port = getpid();
+ *lenp = 6;
+ buf = snewn(*lenp, char);
+ PUT_32BIT_MSB_FIRST(buf, unix_addr--);
+ PUT_16BIT_MSB_FIRST(buf+4, getpid());
break;
/* XXX IPV6 */
default:
- return 0;
+ return NULL;
}
- return 1;
+ return buf;
}
/*
*/
s->writable = FALSE;
return;
- } else if (nsent == 0 ||
- err == ECONNABORTED || err == ECONNRESET) {
+ } else {
/*
- * If send() returns CONNABORTED or CONNRESET, we
- * unfortunately can't just call plug_closing(),
+ * We unfortunately can't just call plug_closing(),
* because it's quite likely that we're currently
* _in_ a call from the code we'd be calling back
* to, so we'd have to make half the SSH code
*/
s->pending_error = err;
return;
- } else {
- /* We're inside the Unix frontend here, so we know
- * that the frontend handle is unnecessary. */
- logevent(NULL, strerror(err));
- fatalbox("%s", strerror(err));
}
} else {
if (s->sending_oob) {
ret = recv(s->s, buf, sizeof(buf), MSG_OOB);
noise_ultralight(ret);
if (ret <= 0) {
- const char *str = (ret == 0 ? "Internal networking trouble" :
- strerror(errno));
- /* We're inside the Unix frontend here, so we know
- * that the frontend handle is unnecessary. */
- logevent(NULL, str);
- fatalbox("%s", str);
+ return plug_closing(s->plug,
+ ret == 0 ? "Internal networking trouble" :
+ strerror(errno), errno, 0);
} else {
/*
* Receiving actual data on a socket means we can
static void uxsel_tell(Actual_Socket s)
{
int rwx = 0;
- if (!s->connected)
- rwx |= 2; /* write == connect */
- if (s->connected && !s->frozen)
- rwx |= 1 | 4; /* read, except */
- if (bufchain_size(&s->output_data))
- rwx |= 2; /* write */
- if (s->listener)
- rwx |= 1; /* read == accept */
+ if (s->listener) {
+ rwx |= 1; /* read == accept */
+ } else {
+ if (!s->connected)
+ rwx |= 2; /* write == connect */
+ if (s->connected && !s->frozen)
+ rwx |= 1 | 4; /* read, except */
+ if (bufchain_size(&s->output_data))
+ rwx |= 2; /* write */
+ }
uxsel_set(s->s, rwx, net_select_result);
}
else
*canonicalname = dupstr(ret->hostname);
#ifndef NO_IPV6
- ret->ais = NULL;
+ ret->ai = ret->ais = NULL;
#else
ret->addresses = NULL;
+ ret->curraddr = ret->naddresses = 0;
#endif
return ret;
}