int oobinline;
int pending_error; /* in case send() returns error */
int listener;
+ int nodelay, keepalive; /* for connect()-type sockets */
+ int privport, port; /* and again */
+ SockAddr addr;
};
/*
*/
int family;
#ifndef NO_IPV6
- struct addrinfo *ai; /* Address IPv6 style. */
+ struct addrinfo *ais; /* Addresses IPv6 style. */
+ struct addrinfo *ai; /* steps along the linked list */
#else
- unsigned long address; /* Address IPv4 style. */
+ unsigned long *addresses; /* Addresses IPv4 style. */
+ int naddresses, curraddr;
#endif
char hostname[512]; /* Store an unresolved host name. */
};
}
}
-const char *error_string(int error)
-{
- return strerror(error);
-}
-
SockAddr sk_namelookup(const char *host, char **canonicalname, int address_family)
{
SockAddr ret = snew(struct SockAddr_tag);
#else
unsigned long a;
struct hostent *h = NULL;
+ int n;
#endif
char realhost[8192];
hints.ai_addr = NULL;
hints.ai_canonname = NULL;
hints.ai_next = NULL;
- err = getaddrinfo(host, NULL, &hints, &ret->ai);
+ err = getaddrinfo(host, NULL, &hints, &ret->ais);
+ ret->ai = ret->ais;
if (err != 0) {
ret->error = gai_strerror(err);
return ret;
* we don't use gethostbyname as a fallback!)
*/
if (ret->family == 0) {
- /*debug(("Resolving \"%s\" with gethostbyname() (IPv4 only)...\n", host)); */
- if ( (h = gethostbyname(host)) )
- ret->family = AF_INET;
+ /*debug(("Resolving \"%s\" with gethostbyname() (IPv4 only)...\n", host)); */
+ if ( (h = gethostbyname(host)) )
+ ret->family = AF_INET;
}
if (ret->family == 0) {
- ret->error = (h_errno == HOST_NOT_FOUND ||
- h_errno == NO_DATA ||
- h_errno == NO_ADDRESS ? "Host does not exist" :
- h_errno == TRY_AGAIN ?
- "Temporary name service failure" :
- "gethostbyname: unknown error");
- return ret;
+ ret->error = (h_errno == HOST_NOT_FOUND ||
+ h_errno == NO_DATA ||
+ h_errno == NO_ADDRESS ? "Host does not exist" :
+ h_errno == TRY_AGAIN ?
+ "Temporary name service failure" :
+ "gethostbyname: unknown error");
+ return ret;
}
- memcpy(&a, h->h_addr, sizeof(a));
/* This way we are always sure the h->h_name is valid :) */
strncpy(realhost, h->h_name, sizeof(realhost));
+ for (n = 0; h->h_addr_list[n]; n++);
+ ret->addresses = snewn(n, unsigned long);
+ ret->naddresses = n;
+ for (n = 0; n < ret->naddresses; n++) {
+ memcpy(&a, h->h_addr_list[n], sizeof(a));
+ ret->addresses[n] = ntohl(a);
+ }
} else {
/*
* This must be a numeric IPv4 address because it caused a
*/
ret->family = AF_INET;
strncpy(realhost, host, sizeof(realhost));
+ ret->addresses = snew(unsigned long);
+ ret->naddresses = 1;
+ ret->addresses[0] = ntohl(a);
+ ret->curraddr = 0;
}
- ret->address = ntohl(a);
#endif
realhost[lenof(realhost)-1] = '\0';
*canonicalname = snewn(1+strlen(realhost), char);
strncpy(ret->hostname, host, lenof(ret->hostname));
ret->hostname[lenof(ret->hostname)-1] = '\0';
#ifndef NO_IPV6
- ret->ai = NULL;
+ ret->ais = NULL;
+#else
+ ret->addresses = NULL;
#endif
return ret;
}
+static int sk_nextaddr(SockAddr addr)
+{
+#ifndef NO_IPV6
+ if (addr->ai->ai_next) {
+ addr->ai = addr->ai->ai_next;
+ addr->family = addr->ai->ai_family;
+ return TRUE;
+ } else
+ return FALSE;
+#else
+ if (addr->curraddr+1 < addr->naddresses) {
+ addr->curraddr++;
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+#endif
+}
+
void sk_getaddr(SockAddr addr, char *buf, int buflen)
{
#else
struct in_addr a;
assert(addr->family == AF_INET);
- a.s_addr = htonl(addr->address);
+ a.s_addr = htonl(addr->addresses[addr->curraddr]);
strncpy(buf, inet_ntoa(a), buflen);
buf[buflen-1] = '\0';
#endif
#else
struct in_addr a;
assert(addr->family == AF_INET);
- a.s_addr = htonl(addr->address);
+ a.s_addr = htonl(addr->addresses[addr->curraddr]);
return ipv4_is_loopback(a);
#endif
}
struct in_addr a;
assert(addr->family == AF_INET);
- a.s_addr = htonl(addr->address);
+ a.s_addr = htonl(addr->addresses[addr->curraddr]);
memcpy(buf, (char*) &a.s_addr, 4);
#endif
}
{
#ifndef NO_IPV6
- if (addr->ai != NULL)
- freeaddrinfo(addr->ai);
+ if (addr->ais != NULL)
+ freeaddrinfo(addr->ais);
+#else
+ sfree(addr->addresses);
#endif
sfree(addr);
}
ret->pending_error = 0;
ret->oobpending = FALSE;
ret->listener = 0;
+ ret->addr = NULL;
ret->s = sockfd;
if (ret->s < 0) {
- ret->error = error_string(errno);
+ ret->error = strerror(errno);
return (Socket) ret;
}
return (Socket) ret;
}
-Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
- int nodelay, int keepalive, Plug plug)
+static int try_connect(Actual_Socket sock)
{
int s;
#ifndef NO_IPV6
struct sockaddr_in a;
struct sockaddr_un au;
const struct sockaddr *sa;
- int err;
- Actual_Socket ret;
+ int err = 0;
short localport;
int fl, salen;
- /*
- * Create Socket structure.
- */
- ret = snew(struct Socket_tag);
- ret->fn = &tcp_fn_table;
- ret->error = NULL;
- ret->plug = plug;
- bufchain_init(&ret->output_data);
- ret->connected = 0; /* to start with */
- ret->writable = 0; /* to start with */
- ret->sending_oob = 0;
- ret->frozen = 0;
- ret->frozen_readable = 0;
- ret->localhost_only = 0; /* unused, but best init anyway */
- ret->pending_error = 0;
- ret->oobpending = FALSE;
- ret->listener = 0;
+ if (sock->s >= 0)
+ close(sock->s);
+
+ plug_log(sock->plug, 0, sock->addr, sock->port, NULL, 0);
/*
* Open socket.
*/
- assert(addr->family != AF_UNSPEC);
- s = socket(addr->family, SOCK_STREAM, 0);
- ret->s = s;
+ assert(sock->addr->family != AF_UNSPEC);
+ s = socket(sock->addr->family, SOCK_STREAM, 0);
+ sock->s = s;
if (s < 0) {
- ret->error = error_string(errno);
- return (Socket) ret;
+ err = errno;
+ goto ret;
}
- ret->oobinline = oobinline;
- if (oobinline) {
+ if (sock->oobinline) {
int b = TRUE;
setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (void *) &b, sizeof(b));
}
- if (nodelay) {
+ if (sock->nodelay) {
int b = TRUE;
setsockopt(s, IPPROTO_TCP, TCP_NODELAY, (void *) &b, sizeof(b));
}
- if (keepalive) {
+ if (sock->keepalive) {
int b = TRUE;
setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (void *) &b, sizeof(b));
}
/*
* Bind to local address.
*/
- if (privport)
+ if (sock->privport)
localport = 1023; /* count from 1023 downwards */
else
localport = 0; /* just use port 0 (ie kernel picks) */
/* 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(addr->family != AF_UNIX) {
+ if(sock->addr->family != AF_UNIX) {
/* Loop round trying to bind */
while (1) {
int retcode;
#ifndef NO_IPV6
- if (addr->family == AF_INET6) {
+ if (sock->addr->family == AF_INET6) {
/* XXX use getaddrinfo to get a local address? */
a6.sin6_family = AF_INET6;
a6.sin6_addr = in6addr_any;
} else
#endif
{
- assert(addr->family == AF_INET);
+ assert(sock->addr->family == AF_INET);
a.sin_family = AF_INET;
a.sin_addr.s_addr = htonl(INADDR_ANY);
a.sin_port = htons(localport);
break; /* we might have got to the end */
}
- if (err) {
- ret->error = error_string(err);
- return (Socket) ret;
- }
+ if (err)
+ goto ret;
}
/*
* Connect to remote address.
*/
- switch(addr->family) {
+ switch(sock->addr->family) {
#ifndef NO_IPV6
case AF_INET:
/* XXX would be better to have got getaddrinfo() to fill in the port. */
- ((struct sockaddr_in *)addr->ai->ai_addr)->sin_port =
- htons(port);
- sa = (const struct sockaddr *)addr->ai->ai_addr;
- salen = addr->ai->ai_addrlen;
+ ((struct sockaddr_in *)sock->addr->ai->ai_addr)->sin_port =
+ htons(sock->port);
+ sa = (const struct sockaddr *)sock->addr->ai->ai_addr;
+ salen = sock->addr->ai->ai_addrlen;
break;
case AF_INET6:
- ((struct sockaddr_in *)addr->ai->ai_addr)->sin_port =
- htons(port);
- sa = (const struct sockaddr *)addr->ai->ai_addr;
- salen = addr->ai->ai_addrlen;
+ ((struct sockaddr_in *)sock->addr->ai->ai_addr)->sin_port =
+ htons(sock->port);
+ sa = (const struct sockaddr *)sock->addr->ai->ai_addr;
+ salen = sock->addr->ai->ai_addrlen;
break;
#else
case AF_INET:
a.sin_family = AF_INET;
- a.sin_addr.s_addr = htonl(addr->address);
- a.sin_port = htons((short) port);
+ a.sin_addr.s_addr = htonl(sock->addr->addresses[sock->addr->curraddr]);
+ a.sin_port = htons((short) sock->port);
sa = (const struct sockaddr *)&a;
salen = sizeof a;
break;
#endif
case AF_UNIX:
- assert(port == 0); /* to catch confused people */
- assert(strlen(addr->hostname) < sizeof au.sun_path);
+ assert(sock->port == 0); /* to catch confused people */
+ assert(strlen(sock->addr->hostname) < sizeof au.sun_path);
memset(&au, 0, sizeof au);
au.sun_family = AF_UNIX;
- strcpy(au.sun_path, addr->hostname);
+ strcpy(au.sun_path, sock->addr->hostname);
sa = (const struct sockaddr *)&au;
salen = sizeof au;
break;
if ((connect(s, sa, salen)) < 0) {
if ( errno != EINPROGRESS ) {
- ret->error = error_string(errno);
- return (Socket) ret;
+ err = errno;
+ goto ret;
}
} else {
/*
* If we _don't_ get EWOULDBLOCK, the connect has completed
* and we should set the socket as connected and writable.
*/
- ret->connected = 1;
- ret->writable = 1;
+ sock->connected = 1;
+ sock->writable = 1;
}
- uxsel_tell(ret);
- add234(sktree, ret);
+ uxsel_tell(sock);
+ add234(sktree, sock);
+
+ ret:
+ if (err)
+ plug_log(sock->plug, 1, sock->addr, sock->port, strerror(err), err);
+ return err;
+}
+
+Socket sk_new(SockAddr addr, int port, int privport, int oobinline,
+ int nodelay, int keepalive, Plug plug)
+{
+ Actual_Socket ret;
+ int err;
+
+ /*
+ * Create Socket structure.
+ */
+ ret = snew(struct Socket_tag);
+ ret->fn = &tcp_fn_table;
+ ret->error = NULL;
+ ret->plug = plug;
+ bufchain_init(&ret->output_data);
+ ret->connected = 0; /* to start with */
+ ret->writable = 0; /* to start with */
+ ret->sending_oob = 0;
+ ret->frozen = 0;
+ ret->frozen_readable = 0;
+ ret->localhost_only = 0; /* unused, but best init anyway */
+ ret->pending_error = 0;
+ ret->oobpending = FALSE;
+ ret->listener = 0;
+ ret->addr = addr;
+ ret->s = -1;
+ ret->oobinline = oobinline;
+ ret->nodelay = nodelay;
+ ret->keepalive = keepalive;
+ ret->privport = privport;
+ ret->port = port;
+
+ err = 0;
+ do {
+ err = try_connect(ret);
+ } while (err && sk_nextaddr(ret->addr));
- sk_addr_free(addr);
+ if (err)
+ ret->error = strerror(err);
return (Socket) ret;
}
ret->pending_error = 0;
ret->oobpending = FALSE;
ret->listener = 1;
+ ret->addr = NULL;
/*
* Translate address_family from platform-independent constants
}
if (s < 0) {
- ret->error = error_string(errno);
+ ret->error = strerror(errno);
return (Socket) ret;
}
retcode = bind(s, addr, addrlen);
if (retcode < 0) {
close(s);
- ret->error = error_string(errno);
+ ret->error = strerror(errno);
return (Socket) ret;
}
-
if (listen(s, SOMAXCONN) < 0) {
close(s);
- ret->error = error_string(errno);
+ ret->error = strerror(errno);
return (Socket) ret;
}
uxsel_del(s->s);
del234(sktree, s);
close(s->s);
+ if (s->addr)
+ sk_addr_free(s->addr);
sfree(s);
}
} else {
/* We're inside the Unix frontend here, so we know
* that the frontend handle is unnecessary. */
- logevent(NULL, error_string(err));
- fatalbox("%s", error_string(err));
+ logevent(NULL, strerror(err));
+ fatalbox("%s", strerror(err));
}
} else {
if (s->sending_oob) {
noise_ultralight(ret);
if (ret <= 0) {
const char *str = (ret == 0 ? "Internal networking trouble" :
- error_string(errno));
+ strerror(errno));
/* We're inside the Unix frontend here, so we know
* that the frontend handle is unnecessary. */
logevent(NULL, str);
fatalbox("%s", str);
} else {
+ /*
+ * Receiving actual data on a socket means we can
+ * stop falling back through the candidate
+ * addresses to connect to.
+ */
+ if (s->addr) {
+ sk_addr_free(s->addr);
+ s->addr = NULL;
+ }
return plug_receive(s->plug, 2, buf, ret);
}
break;
}
}
if (ret < 0) {
- return plug_closing(s->plug, error_string(errno), errno, 0);
+ /*
+ * An error at this point _might_ be an error reported
+ * by a non-blocking connect(). So before we return a
+ * panic status to the user, let's just see whether
+ * that's the case.
+ */
+ 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)) {
+ err = try_connect(s);
+ }
+ }
+ if (err != 0)
+ return plug_closing(s->plug, strerror(err), err, 0);
} else if (0 == ret) {
return plug_closing(s->plug, NULL, 0, 0);
} else {
+ /*
+ * Receiving actual data on a socket means we can
+ * stop falling back through the candidate
+ * addresses to connect to.
+ */
+ if (s->addr) {
+ sk_addr_free(s->addr);
+ s->addr = NULL;
+ }
return plug_receive(s->plug, atmark ? 0 : 1, buf, ret);
}
break;
* An error has occurred on this socket. Pass it to the
* plug.
*/
- plug_closing(s->plug, error_string(s->pending_error),
+ plug_closing(s->plug, strerror(s->pending_error),
s->pending_error, 0);
break;
}
ret->error = "X11 UNIX name too long";
else
*canonicalname = dupstr(ret->hostname);
+#ifndef NO_IPV6
+ ret->ais = NULL;
+#else
+ ret->addresses = NULL;
+#endif
return ret;
}
projects / u / mdw / putty / blobdiff