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

ERROR all outstanding netreqs whith a failed statefull upstream 

Remove the currently processed netreq first, so it can be retries with another upstream/transport.
We MUST add netreq to the netreqs_by_query_id map even before we write to it, to have a reliable store of taken query ids.
This commit is contained in:
Willem Toorop 2017-06-15 21:15:00 +02:00
parent d9158e639b
commit 1d87437854
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/stub.c
View File

@ -540,6 +540,8 @@ stub_cleanup(getdns_network_req *netreq)
static void static void
upstream_failed(getdns_upstream *upstream, int during_setup) upstream_failed(getdns_upstream *upstream, int during_setup)
{ {
getdns_network_req *netreq;
DEBUG_STUB("%s %-35s: FD: %d Failure during connection setup = %d\n", DEBUG_STUB("%s %-35s: FD: %d Failure during connection setup = %d\n",
STUB_DEBUG_CLEANUP, __FUNC__, upstream->fd, during_setup); STUB_DEBUG_CLEANUP, __FUNC__, upstream->fd, during_setup);
/* Fallback code should take care of queue queries and then close conn /* Fallback code should take care of queue queries and then close conn
@ -565,7 +567,7 @@ upstream_failed(getdns_upstream *upstream, int during_setup)
} else { } else {
upstream->conn_shutdowns++; upstream->conn_shutdowns++;
/* [TLS1]TODO: Re-try these queries if possible.*/ /* [TLS1]TODO: Re-try these queries if possible.*/
getdns_network_req *netreq; }
while (upstream->netreq_by_query_id.count) { while (upstream->netreq_by_query_id.count) {
netreq = (getdns_network_req *) netreq = (getdns_network_req *)
_getdns_rbtree_first(&upstream->netreq_by_query_id); _getdns_rbtree_first(&upstream->netreq_by_query_id);
@ -573,8 +575,6 @@ upstream_failed(getdns_upstream *upstream, int during_setup)
_getdns_netreq_change_state(netreq, NET_REQ_ERRORED); _getdns_netreq_change_state(netreq, NET_REQ_ERRORED);
_getdns_check_dns_req_complete(netreq->owner); _getdns_check_dns_req_complete(netreq->owner);
} }
}
upstream->conn_state = GETDNS_CONN_TEARDOWN; upstream->conn_state = GETDNS_CONN_TEARDOWN;
} }
@ -1723,6 +1723,7 @@ upstream_write_cb(void *userarg)
*/ */
case STUB_TCP_WOULDBLOCK: case STUB_TCP_WOULDBLOCK:
return; return;
case STUB_OUT_OF_OPTIONS:
case STUB_TCP_ERROR: case STUB_TCP_ERROR:
/* New problem with the TCP connection itself. Need to fallback.*/ /* New problem with the TCP connection itself. Need to fallback.*/
/* Fall through */ /* Fall through */
@ -1730,6 +1731,8 @@ upstream_write_cb(void *userarg)
/* Could not complete the set up. Need to fallback.*/ /* Could not complete the set up. Need to fallback.*/
DEBUG_STUB("%s %-35s: Upstream: %p ERROR = %d\n", STUB_DEBUG_WRITE, DEBUG_STUB("%s %-35s: Upstream: %p ERROR = %d\n", STUB_DEBUG_WRITE,
__FUNC__, (void*)userarg, q); __FUNC__, (void*)userarg, q);
(void) _getdns_rbtree_delete(
&upstream->netreq_by_query_id, (void *)(intptr_t)netreq->query_id);
upstream_failed(upstream, (q == STUB_TCP_ERROR ? 0:1)); upstream_failed(upstream, (q == STUB_TCP_ERROR ? 0:1));
/* Fall through */ /* Fall through */
case STUB_CONN_GONE: case STUB_CONN_GONE:
@ -1741,8 +1744,7 @@ upstream_write_cb(void *userarg)
STUB_DEBUG_DAEMON, upstream->addr_str, STUB_DEBUG_DAEMON, upstream->addr_str,
(upstream->transport == GETDNS_TRANSPORT_TLS ? "TLS" : "TCP")); (upstream->transport == GETDNS_TRANSPORT_TLS ? "TLS" : "TCP"));
#endif #endif
if (q != STUB_TCP_ERROR && if (fallback_on_write(netreq) == STUB_TCP_ERROR) {
fallback_on_write(netreq) == STUB_TCP_ERROR) {
/* TODO: Need new state to report transport unavailable*/ /* TODO: Need new state to report transport unavailable*/
_getdns_netreq_change_state(netreq, NET_REQ_ERRORED); _getdns_netreq_change_state(netreq, NET_REQ_ERRORED);
_getdns_check_dns_req_complete(netreq->owner); _getdns_check_dns_req_complete(netreq->owner);