emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/fetch: cleanup happy eyeballs and add verbose logging

Browse Source
This commit is contained in:
Duncaen 2019-06-20 12:14:32 +02:00
parent 550bdfdcda
commit 81a736a5ac
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/fetch/common.c
View File

@ -452,7 +452,7 @@ fetch_socks5(conn_t *conn, struct url *url, struct url *socks, int verbose)
#define UNREACH_IPV6 0x01 #define UNREACH_IPV6 0x01
#define UNREACH_IPV4 0x10 #define UNREACH_IPV4 0x10
static int static int
happy_eyeballs_connect(struct addrinfo *res0) happy_eyeballs_connect(struct addrinfo *res0, int verbose)
{ {
static int unreach = 0; static int unreach = 0;
struct pollfd *pfd; struct pollfd *pfd;
@ -474,26 +474,25 @@ happy_eyeballs_connect(struct addrinfo *res0)
case AF_INET: n4++; break; case AF_INET: n4++; break;
} }
if (n4+n6 == 0 || !(pfd = calloc(n4+n6, sizeof (struct pollfd))))
return -1;
#ifdef FULL_DEBUG #ifdef FULL_DEBUG
fetch_info("got %d A and %d AAAA records", n4, n6); fetch_info("got %d A and %d AAAA records", n4, n6);
#endif #endif
i4 = i6 = 0; i4 = i6 = 0;
if (getenv("FORCE_IPV4")) if (unreach & UNREACH_IPV6 || getenv("FORCE_IPV4"))
i6 = n6; i6 = n6;
if (getenv("FORCE_IPV6")) if (unreach & UNREACH_IPV4 || getenv("FORCE_IPV6"))
i4 = n4; i4 = n4;
if (unreach & UNREACH_IPV6) if (n6+n4 == 0 || i6+i4 == n6+n4) {
i6 = n6; netdb_seterr(EAI_FAIL);
if (unreach & UNREACH_IPV4) return -1;
i4 = n4; }
if (i6+i4 == n6+n4) if (!(pfd = calloc(n4+n6, sizeof (struct pollfd)))) {
goto error; fetch_syserr();
return -1;
}
res = NULL; res = NULL;
for (;;) { for (;;) {
@ -502,8 +501,9 @@ happy_eyeballs_connect(struct addrinfo *res0)
unsigned short family = 0; unsigned short family = 0;
#ifdef FULL_DEBUG #ifdef FULL_DEBUG
fetch_info("happy eyeballs state: i4=%u n4=%u i6=%u n6=%u" if (verbose)
" attempts=%u waiting=%u", i4, n4, i6, n6, attempts, waiting); fetch_info("happy eyeballs state: i4=%u n4=%u i6=%u n6=%u"
" attempts=%u waiting=%u", i4, n4, i6, n6, attempts, waiting);
#endif #endif
if (i6+i4 < n6+n4) { if (i6+i4 < n6+n4) {
@ -523,9 +523,8 @@ happy_eyeballs_connect(struct addrinfo *res0)
} }
} else { } else {
/* no more connections to try */ /* no more connections to try */
#ifdef FULL_DEBUG if (verbose)
fetch_info("attempted to connect to all addresses, waiting..."); fetch_info("attempted to connect to all addresses, waiting...");
#endif
timeout = fetchConnTimeout; timeout = fetchConnTimeout;
done = 1; done = 1;
goto wait; goto wait;
@ -545,11 +544,13 @@ happy_eyeballs_connect(struct addrinfo *res0)
i++; i++;
} }
} }
if (res == NULL) if (res == NULL) {
goto error; netdb_seterr(EAI_FAIL);
goto out;
}
if ((sd = socket(res->ai_family, res->ai_socktype | SOCK_NONBLOCK, if ((sd = socket(res->ai_family, res->ai_socktype | SOCK_NONBLOCK,
res->ai_protocol)) == -1) res->ai_protocol)) == -1)
continue; continue;
if (bindaddr != NULL && *bindaddr != '\0' && if (bindaddr != NULL && *bindaddr != '\0' &&
@ -559,11 +560,14 @@ happy_eyeballs_connect(struct addrinfo *res0)
continue; continue;
} }
{ if (verbose) {
char hbuf[1025]; char hbuf[1025];
if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf), NULL, if (getnameinfo(res->ai_addr, res->ai_addrlen, hbuf, sizeof(hbuf), NULL,
0, NI_NUMERICHOST) == 0) 0, NI_NUMERICHOST) == 0)
fetch_info("connecting to %s", hbuf); fetch_info("connecting to %s:%d", hbuf,
htons(res->ai_family == AF_INET
? ((struct sockaddr_in *)(res->ai_addr))->sin_port
: ((struct sockaddr_in6 *)(res->ai_addr))->sin6_port));
} }
if (connect(sd, res->ai_addr, res->ai_addrlen) == -1) { if (connect(sd, res->ai_addr, res->ai_addrlen) == -1) {
@ -595,10 +599,9 @@ happy_eyeballs_connect(struct addrinfo *res0)
waiting++; waiting++;
wait: wait:
if (!attempts) { if (!attempts) {
error:
netdb_seterr(EAI_FAIL); netdb_seterr(EAI_FAIL);
free(pfd); rv = -1;
return -1; goto out;
} }
for (i = 0; i < attempts; i++) { for (i = 0; i < attempts; i++) {
pfd[i].revents = pfd[i].events = 0; pfd[i].revents = pfd[i].events = 0;
@ -637,8 +640,11 @@ error:
} }
if (!waiting) if (!waiting)
break; break;
else if (done)
goto wait;
} }
out:
for (i = 0; i < attempts; i++) for (i = 0; i < attempts; i++)
if ((rv == -1 || rv != pfd[i].fd) && pfd[i].fd != -1) if ((rv == -1 || rv != pfd[i].fd) && pfd[i].fd != -1)
close(pfd[i].fd); close(pfd[i].fd);
@ -703,7 +709,7 @@ fetch_connect(struct url *url, int af, int verbose)
if (verbose) if (verbose)
fetch_info("connecting to %s:%d", connurl->host, connurl->port); fetch_info("connecting to %s:%d", connurl->host, connurl->port);
sd = happy_eyeballs_connect(res0); sd = happy_eyeballs_connect(res0, verbose);
freeaddrinfo(res0); freeaddrinfo(res0);
if (sd == -1) if (sd == -1)
return (NULL); return (NULL);