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

Clear netreq_by_query_id on upstream failure 

But don't error the specific netreq then!
This commit is contained in:
Willem Toorop 2017-06-15 17:21:05 +02:00
parent e2be41d352
commit d9158e639b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stub.c
View File

@ -565,7 +565,6 @@ 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; 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 *)
@ -574,7 +573,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;
@ -781,8 +779,8 @@ stub_tcp_write(int fd, getdns_tcp_state *tcp, getdns_network_req *netreq)
&netreq->upstream->netreq_by_query_id, &netreq->node)); &netreq->upstream->netreq_by_query_id, &netreq->node));
netreq->query_id = query_id; netreq->query_id = query_id;
GLDNS_ID_SET(netreq->query, query_id); GLDNS_ID_SET(netreq->query, query_id);
if (netreq->opt) { if (netreq->opt) {
_getdns_network_req_clear_upstream_options(netreq); _getdns_network_req_clear_upstream_options(netreq);
/* no limits on the max udp payload size with tcp */ /* no limits on the max udp payload size with tcp */
@ -1282,7 +1280,9 @@ stub_tls_write(getdns_upstream *upstream, getdns_tcp_state *tcp,
} while (!_getdns_rbtree_insert( } while (!_getdns_rbtree_insert(
&netreq->upstream->netreq_by_query_id, &netreq->node)); &netreq->upstream->netreq_by_query_id, &netreq->node));
netreq->query_id = query_id;
GLDNS_ID_SET(netreq->query, query_id); GLDNS_ID_SET(netreq->query, query_id);
/* TODO: Review if more EDNS0 handling can be centralised.*/ /* TODO: Review if more EDNS0 handling can be centralised.*/
if (netreq->opt) { if (netreq->opt) {
_getdns_network_req_clear_upstream_options(netreq); _getdns_network_req_clear_upstream_options(netreq);
@ -1741,7 +1741,8 @@ 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 (fallback_on_write(netreq) == STUB_TCP_ERROR) { if (q != 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);
@ -1760,7 +1761,7 @@ upstream_write_cb(void *userarg)
/* Need this because auth status is reset on connection close */ /* Need this because auth status is reset on connection close */
netreq->debug_tls_auth_status = netreq->upstream->tls_auth_state; netreq->debug_tls_auth_status = netreq->upstream->tls_auth_state;
upstream->queries_sent++; upstream->queries_sent++;
netreq->query_id = (uint16_t) q;
/* Unqueue the netreq from the write_queue */ /* Unqueue the netreq from the write_queue */
if (!(upstream->write_queue = netreq->write_queue_tail)) { if (!(upstream->write_queue = netreq->write_queue_tail)) {
upstream->write_queue_last = NULL; upstream->write_queue_last = NULL;
@ -2090,6 +2091,8 @@ upstream_find_for_netreq(getdns_network_req *netreq)
netreq->transport_current = i; netreq->transport_current = i;
netreq->upstream = upstream; netreq->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);
return fd; return fd;
} }
/* Handle better, will give generic error*/ /* Handle better, will give generic error*/