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

Tinker with upstream keepalive

This commit is contained in:
Sara Dickinson 2016-07-21 19:24:18 +02:00
parent 7f2fcca80d
commit 0432fe37c4
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/context.c
View File

@ -711,6 +711,7 @@ _getdns_upstream_shutdown(getdns_upstream *upstream)
upstream->responses_received = 0; upstream->responses_received = 0;
upstream->responses_timeouts = 0; upstream->responses_timeouts = 0;
upstream->keepalive_timeout = 0; upstream->keepalive_timeout = 0;
upstream->keepalive_shutdown = 0;
/* Now TLS stuff*/ /* Now TLS stuff*/
upstream->tls_auth_state = GETDNS_AUTH_NONE; upstream->tls_auth_state = GETDNS_AUTH_NONE;
@ -836,6 +837,7 @@ upstream_init(getdns_upstream *upstream,
upstream->queries_sent = 0; upstream->queries_sent = 0;
upstream->responses_received = 0; upstream->responses_received = 0;
upstream->responses_timeouts = 0; upstream->responses_timeouts = 0;
upstream->keepalive_shutdown = 0;
upstream->keepalive_timeout = 0; upstream->keepalive_timeout = 0;
upstream->to_retry = 2; upstream->to_retry = 2;
upstream->back_off = 1; upstream->back_off = 1;

1
src/context.h
View File

@ -148,6 +148,7 @@ typedef struct getdns_upstream {
size_t queries_sent; size_t queries_sent;
size_t responses_received; size_t responses_received;
size_t responses_timeouts; size_t responses_timeouts;
size_t keepalive_shutdown;
uint64_t keepalive_timeout; uint64_t keepalive_timeout;
/* Management of outstanding requests on stateful transports */ /* Management of outstanding requests on stateful transports */

15
src/stub.c
View File

@ -342,9 +342,17 @@ process_keepalive(
/* 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;
DEBUG_STUB("%s %-35s: FD: %d Server Keepalive recived: %d ms\n",
STUB_DEBUG_READ, __FUNCTION__, upstream->fd,
(int)server_keepalive);
if (netreq->owner->context->idle_timeout < server_keepalive) if (netreq->owner->context->idle_timeout < server_keepalive)
upstream->keepalive_timeout = netreq->owner->context->idle_timeout; upstream->keepalive_timeout = netreq->owner->context->idle_timeout;
else { else {
if (server_keepalive == 0) {
/* This means the server wants us to shut the connection (sending no
more queries). */
upstream->keepalive_shutdown = 1;
}
upstream->keepalive_timeout = server_keepalive; upstream->keepalive_timeout = server_keepalive;
DEBUG_STUB("%s %-35s: FD: %d Server Keepalive used: %d ms\n", DEBUG_STUB("%s %-35s: FD: %d Server Keepalive used: %d ms\n",
STUB_DEBUG_READ, __FUNCTION__, upstream->fd, STUB_DEBUG_READ, __FUNCTION__, upstream->fd,
@ -1551,8 +1559,11 @@ upstream_working_ok(getdns_upstream *upstream)
static int static int
upstream_active(getdns_upstream *upstream) upstream_active(getdns_upstream *upstream)
{ {
return ((upstream->conn_state == GETDNS_CONN_SETUP || if ((upstream->conn_state == GETDNS_CONN_SETUP ||
upstream->conn_state == GETDNS_CONN_OPEN) ? 1 : 0); upstream->conn_state == GETDNS_CONN_OPEN) &&
upstream->keepalive_shutdown == 0)
return 1;
return 0;
} }
static int static int