interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Catch another error path for failed connections

This commit is contained in:
Sara Dickinson 2016-08-08 16:12:33 +01:00
parent fdbefa17ec
commit 6f9bfffe9f
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/stub.c
View File

@ -1764,21 +1764,28 @@ upstream_find_for_transport(getdns_network_req *netreq,
getdns_transport_list_t transport, getdns_transport_list_t transport,
int *fd) int *fd)
{ {
/* [TLS1]TODO: Don't currently loop over upstreams here as UDP will timeout
and stateful will fallback. But there is a case where connect returns -1
that we need to deal with!!!! so add a while loop to test fd*/
getdns_upstream *upstream = NULL; getdns_upstream *upstream = NULL;
/* UDP always returns an upstream, the only reason this will fail is if
no socket is available, in which case that is an error.*/
if (transport == GETDNS_TRANSPORT_UDP) { if (transport == GETDNS_TRANSPORT_UDP) {
upstream = upstream_select(netreq); upstream = upstream_select(netreq);
*fd = upstream_connect(upstream, transport, netreq->owner);
return upstream;
} }
else else {
upstream = upstream_select_stateful(netreq, transport); /* For stateful transport we should keep trying until all our transports
if (!upstream) are exhausted/backed-off (no upstream)*/
return NULL; do {
*fd = upstream_connect(upstream, transport, netreq->owner); upstream = upstream_select_stateful(netreq, transport);
DEBUG_STUB("%s %-35s: FD: %d Connecting to upstream: %p No: %d\n", if (!upstream)
return NULL;
*fd = upstream_connect(upstream, transport, netreq->owner);
} while (*fd == -1);
DEBUG_STUB("%s %-35s: FD: %d Connecting to upstream: %p No: %d\n",
STUB_DEBUG_SETUP, __FUNCTION__, *fd, upstream, STUB_DEBUG_SETUP, __FUNCTION__, *fd, upstream,
(int)(upstream - netreq->owner->context->upstreams->upstreams)); (int)(upstream - netreq->owner->context->upstreams->upstreams));
}
return upstream; return upstream;
} }