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

Fix geting recursive_upstream_servers

This commit is contained in:
Willem Toorop 2015-07-13 16:22:39 +02:00
parent 17faffa664
commit 5c61954427
1 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/context.c
View File

@ -2357,6 +2357,14 @@ getdns_context_set_eventloop(struct getdns_context* context, getdns_eventloop* l
return GETDNS_RETURN_GOOD; return GETDNS_RETURN_GOOD;
} }
static in_port_t
upstream_port(getdns_upstream *upstream)
{
return ntohs(upstream->addr.ss_family == AF_INET
? ((struct sockaddr_in *)&upstream->addr)->sin_port
: ((struct sockaddr_in6*)&upstream->addr)->sin6_port);
}
static getdns_dict* static getdns_dict*
priv_get_context_settings(getdns_context* context) { priv_get_context_settings(getdns_context* context) {
getdns_return_t r = GETDNS_RETURN_GOOD; getdns_return_t r = GETDNS_RETURN_GOOD;
@ -2385,11 +2393,25 @@ priv_get_context_settings(getdns_context* context) {
getdns_list_create_with_context(context); getdns_list_create_with_context(context);
for (i = 0; i < context->upstreams->count; i++) { for (i = 0; i < context->upstreams->count; i++) {
size_t j;
getdns_dict *d; getdns_dict *d;
upstream = &context->upstreams->upstreams[i]; upstream = &context->upstreams->upstreams[i];
d = sockaddr_dict(context, d = sockaddr_dict(context,
(struct sockaddr *)&upstream->addr); (struct sockaddr *)&upstream->addr);
r |= getdns_list_set_dict(upstreams, i, d); for ( j = 1, i++
; j < GETDNS_UPSTREAM_TRANSPORTS &&
i < context->upstreams->count
; j++, i++) {
upstream = &context->upstreams->upstreams[i];
if (upstream->transport != GETDNS_TRANSPORT_TLS)
continue;
if (upstream_port(upstream) != getdns_port_array[j])
continue;
(void) getdns_dict_set_int(d, "tls_port",
(uint32_t) upstream_port(upstream));
}
r |= getdns_list_append_dict(upstreams, d);
getdns_dict_destroy(d); getdns_dict_destroy(d);
} }
r |= getdns_dict_set_list(result, "upstream_recursive_servers", r |= getdns_dict_set_list(result, "upstream_recursive_servers",
@ -2754,11 +2776,25 @@ getdns_context_get_upstream_recursive_servers(getdns_context *context,
getdns_upstream *upstream; getdns_upstream *upstream;
getdns_list *upstreams = getdns_list_create(); getdns_list *upstreams = getdns_list_create();
for (i = 0; i < context->upstreams->count; i++) { for (i = 0; i < context->upstreams->count; i++) {
getdns_dict *d; size_t j;
upstream = &context->upstreams->upstreams[i]; getdns_dict *d;
d = sockaddr_dict(context, (struct sockaddr *)&upstream->addr); upstream = &context->upstreams->upstreams[i];
r |= getdns_list_set_dict(upstreams, i, d); d = sockaddr_dict(context, (struct sockaddr *)&upstream->addr);
getdns_dict_destroy(d); for ( j = 1, i++
; j < GETDNS_UPSTREAM_TRANSPORTS &&
i < context->upstreams->count
; j++, i++) {
upstream = &context->upstreams->upstreams[i];
if (upstream->transport != GETDNS_TRANSPORT_TLS)
continue;
if (upstream_port(upstream) != getdns_port_array[j])
continue;
(void) getdns_dict_set_int(d, "tls_port",
(uint32_t) upstream_port(upstream));
}
r |= getdns_list_append_dict(upstreams, d);
getdns_dict_destroy(d);
} }
if (r != GETDNS_RETURN_GOOD) { if (r != GETDNS_RETURN_GOOD) {
getdns_list_destroy(upstreams); getdns_list_destroy(upstreams);