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

Merge branch 'bugfix/388-endless-fallback-loop' into release/1.4.1

This commit is contained in:
Willem Toorop 2018-03-05 11:52:36 +01:00
parent 9da06230d9 0ff1839a6f
commit fd5e0cdc02
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/request-internal.c
View File

@ -134,6 +134,7 @@ netreq_reset(getdns_network_req *net_req)
uint8_t *buf; uint8_t *buf;
/* variables that need to be reset on reinit /* variables that need to be reset on reinit
*/ */
net_req->first_upstream = NULL;
net_req->unbound_id = -1; net_req->unbound_id = -1;
_getdns_netreq_change_state(net_req, NET_REQ_NOT_SENT); _getdns_netreq_change_state(net_req, NET_REQ_NOT_SENT);
if (net_req->query_id_registered) { if (net_req->query_id_registered) {

5
src/stub.c
View File

@ -2296,8 +2296,13 @@ upstream_find_for_netreq(getdns_network_req *netreq)
return STUB_TRY_AGAIN_LATER; return STUB_TRY_AGAIN_LATER;
return -1; return -1;
} }
if (upstream == netreq->first_upstream)
continue;
netreq->transport_current = i; netreq->transport_current = i;
netreq->upstream = upstream; netreq->upstream = upstream;
if (!netreq->first_upstream)
netreq->first_upstream = upstream;
netreq->keepalive_sent = 0; netreq->keepalive_sent = 0;
DEBUG_STUB("%s %-35s: MSG: %p found upstream %p with transport %d, fd: %d\n", STUB_DEBUG_SCHEDULE, __FUNC__, (void*)netreq, (void *)upstream, (int)netreq->transports[i], fd); DEBUG_STUB("%s %-35s: MSG: %p found upstream %p with transport %d, fd: %d\n", STUB_DEBUG_SCHEDULE, __FUNC__, (void*)netreq, (void *)upstream, (int)netreq->transports[i], fd);

1
src/types-internal.h
View File

@ -221,6 +221,7 @@ typedef struct getdns_network_req
getdns_redirects_t follow_redirects; getdns_redirects_t follow_redirects;
/* For stub resolving */ /* For stub resolving */
struct getdns_upstream *first_upstream;
struct getdns_upstream *upstream; struct getdns_upstream *upstream;
int fd; int fd;
getdns_transport_list_t transports[GETDNS_TRANSPORTS_MAX]; getdns_transport_list_t transports[GETDNS_TRANSPORTS_MAX];