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

Recommit parts of "Minor fixes in MDNS code to make sure it does work after the recent loop tightening."

This commit is contained in:
Willem Toorop 2017-03-23 13:09:34 +01:00
parent b32ee619f1
commit 15b451d71b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.c
View File

@ -3569,10 +3569,12 @@ _get_context_settings(getdns_context* context)
return NULL; return NULL;
/* int fields */ /* int fields */
/* the timeouts are stored as uint64, but the value maximum used in
practice is 6553500ms, so we just trim the value to be on the safe side. */
if ( getdns_dict_set_int(result, "timeout", if ( getdns_dict_set_int(result, "timeout",
context->timeout) (context->timeout > 0xFFFFFFFFull) ? 0xFFFFFFFF: (uint32_t) context->timeout)
|| getdns_dict_set_int(result, "idle_timeout", || getdns_dict_set_int(result, "idle_timeout",
context->idle_timeout) (context->idle_timeout > 0xFFFFFFFFull) ? 0xFFFFFFFF : (uint32_t) context->idle_timeout)
|| getdns_dict_set_int(result, "limit_outstanding_queries", || getdns_dict_set_int(result, "limit_outstanding_queries",
context->limit_outstanding_queries) context->limit_outstanding_queries)
|| getdns_dict_set_int(result, "dnssec_allowed_skew", || getdns_dict_set_int(result, "dnssec_allowed_skew",

2
src/util-internal.c
View File

@ -862,7 +862,7 @@ _getdns_create_call_reporting_dict(
return NULL; return NULL;
} }
} else{ } else{
uint32_t idle_timeout = netreq->upstream->keepalive_timeout; uint32_t idle_timeout = (uint32_t) netreq->upstream->keepalive_timeout;
if (getdns_dict_set_int( netreq_debug, "idle timeout in ms", idle_timeout)) { if (getdns_dict_set_int( netreq_debug, "idle timeout in ms", idle_timeout)) {
getdns_dict_destroy(netreq_debug); getdns_dict_destroy(netreq_debug);
return NULL; return NULL;