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

Fire idle timeouts immediately with sync requests

This commit is contained in:
Willem Toorop 2016-04-13 12:06:51 +02:00
parent 57954ad41e
commit 516f211843
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/stub.c
View File

@ -205,7 +205,12 @@ attach_edns_cookie(getdns_network_req *req)
} }
/* Will find a matching OPT RR, but leaves the caller to validate it*/ /* Will find a matching OPT RR, but leaves the caller to validate it
*
* Returns 2 when found
* 0 when not found
* and 1 on FORMERR
*/
static int static int
match_edns_opt_rr(uint16_t code, uint8_t *response, size_t response_len, match_edns_opt_rr(uint16_t code, uint8_t *response, size_t response_len,
const uint8_t **position, uint16_t *option_len) const uint8_t **position, uint16_t *option_len)
@ -306,7 +311,7 @@ match_and_process_server_cookie(
return 0; return 0;
} }
static int static void
process_keepalive( process_keepalive(
getdns_upstream *upstream, getdns_network_req *netreq, getdns_upstream *upstream, getdns_network_req *netreq,
uint8_t *response, size_t response_len) uint8_t *response, size_t response_len)
@ -320,10 +325,10 @@ process_keepalive(
/* If no keepalive sent back, then we must use 0 idle timeout /* If no keepalive sent back, then we must use 0 idle timeout
as server does not support it.*/ as server does not support it.*/
upstream->keepalive_timeout = 0; upstream->keepalive_timeout = 0;
return found; return;
} }
if (option_len != 2) if (option_len != 2)
return 1; /* FORMERR */ return; /* FORMERR */
/* Use server sent value unless the client specified a shorter one. /* Use server sent value unless the client specified a shorter one.
Convert to ms first (wire value has units of 100ms) */ Convert to ms first (wire value has units of 100ms) */
uint64_t server_keepalive = ((uint64_t)gldns_read_uint16(position))*100; uint64_t server_keepalive = ((uint64_t)gldns_read_uint16(position))*100;
@ -335,7 +340,6 @@ process_keepalive(
STUB_DEBUG_CLEANUP, __FUNCTION__, upstream->fd, STUB_DEBUG_CLEANUP, __FUNCTION__, upstream->fd,
(int)server_keepalive); (int)server_keepalive);
} }
return 0;
} }
/** best effort to set nonblocking */ /** best effort to set nonblocking */
@ -1444,12 +1448,11 @@ upstream_read_cb(void *userarg)
match_and_process_server_cookie( match_and_process_server_cookie(
netreq->upstream, netreq->tcp.read_buf, netreq->upstream, netreq->tcp.read_buf,
netreq->tcp.read_pos - netreq->tcp.read_buf)) netreq->tcp.read_pos - netreq->tcp.read_buf))
return; /* Client cookie didn't match? */ return; /* Client cookie didn't match (or FORMERR) */
if ((netreq->owner->context->idle_timeout != 0) && if (netreq->owner->context->idle_timeout != 0)
process_keepalive(netreq->upstream, netreq, netreq->response, process_keepalive(netreq->upstream, netreq, netreq->response,
netreq->response_len)) netreq->response_len);
return;
netreq->debug_end_time = _getdns_get_time_as_uintt64(); netreq->debug_end_time = _getdns_get_time_as_uintt64();
/* This also reschedules events for the upstream*/ /* This also reschedules events for the upstream*/

16
src/sync.c
View File

@ -114,9 +114,21 @@ getdns_sync_data_cleanup(getdns_sync_data *data)
upstream = &ctxt->upstreams->upstreams[i]; upstream = &ctxt->upstreams->upstreams[i];
if (upstream->loop != &data->context->sync_eventloop.loop) if (upstream->loop != &data->context->sync_eventloop.loop)
continue; continue;
if (upstream->event.read_cb || upstream->event.write_cb || if (upstream->event.read_cb || upstream->event.write_cb) {
upstream->event.timeout_cb) {
GETDNS_CLEAR_EVENT(upstream->loop, &upstream->event); GETDNS_CLEAR_EVENT(upstream->loop, &upstream->event);
} else if (upstream->event.timeout_cb) {
/* Timeout's at upstream are idle-timeouts only.
* They should be fired on completion of the
* synchronous request.
*/
GETDNS_CLEAR_EVENT(upstream->loop, &upstream->event);
(*upstream->event.timeout_cb)(upstream->event.userarg);
/* This should have cleared the event */
assert(!upstream->event.read_cb &&
!upstream->event.write_cb &&
!upstream->event.timeout_cb);
} }
upstream->loop = data->context->extension; upstream->loop = data->context->extension;
upstream->is_sync_loop = 0; upstream->is_sync_loop = 0;