diff options
Diffstat (limited to 'libunbound')
| -rw-r--r-- | libunbound/context.h | 2 | ||||
| -rw-r--r-- | libunbound/libunbound.c | 2 | ||||
| -rw-r--r-- | libunbound/libworker.c | 5 | ||||
| -rw-r--r-- | libunbound/python/doc/examples/example7.rst | 2 | ||||
| -rw-r--r-- | libunbound/unbound.h | 11 |
5 files changed, 14 insertions, 8 deletions
diff --git a/libunbound/context.h b/libunbound/context.h index 1761c4d87216..684d11effbc4 100644 --- a/libunbound/context.h +++ b/libunbound/context.h @@ -90,7 +90,7 @@ struct ub_ctx { int dothread; /** next thread number for new threads */ int thr_next_num; - /** if logfile is overriden */ + /** if logfile is overridden */ int logfile_override; /** what logfile to use instead */ FILE* log_out; diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index eaa31c71c590..9b4dcab15794 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -37,7 +37,7 @@ * \file * * This file contains functions to resolve DNS queries and - * validate the answers. Synchonously and asynchronously. + * validate the answers. Synchronously and asynchronously. * */ diff --git a/libunbound/libworker.c b/libunbound/libworker.c index f6a1d1d1c47b..4067ef4d2853 100644 --- a/libunbound/libworker.c +++ b/libunbound/libworker.c @@ -232,8 +232,8 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb) cfg->do_tcp?cfg->outgoing_num_tcp:0, w->env->infra_cache, w->env->rnd, cfg->use_caps_bits_for_id, ports, numports, cfg->unwanted_threshold, - cfg->outgoing_tcp_mss, - &libworker_alloc_cleanup, w, cfg->do_udp, w->sslctx, + cfg->outgoing_tcp_mss, &libworker_alloc_cleanup, w, + cfg->do_udp || cfg->udp_upstream_without_downstream, w->sslctx, cfg->delay_close, NULL); if(!w->is_bg || w->is_bg_thread) { lock_basic_unlock(&ctx->cfglock); @@ -251,6 +251,7 @@ libworker_setup(struct ub_ctx* ctx, int is_bg, struct ub_event_base* eb) w->env->send_query = &libworker_send_query; w->env->detach_subs = &mesh_detach_subs; w->env->attach_sub = &mesh_attach_sub; + w->env->add_sub = &mesh_add_sub; w->env->kill_sub = &mesh_state_delete; w->env->detect_cycle = &mesh_detect_cycle; comm_base_timept(w->base, &w->env->now, &w->env->now_tv); diff --git a/libunbound/python/doc/examples/example7.rst b/libunbound/python/doc/examples/example7.rst index 2f48c8f0f26f..5fde18e05488 100644 --- a/libunbound/python/doc/examples/example7.rst +++ b/libunbound/python/doc/examples/example7.rst @@ -23,7 +23,7 @@ IDN converted attributes The :class:`unbound.ub_data` class contains attributes suffix which converts the dname to UTF string. These attributes have the ``_idn`` suffix. -Apart from this aproach, two conversion functions exist +Apart from this approach, two conversion functions exist (:func:`unbound.idn2dname` and :func:`unbound.dname2idn`). Source code diff --git a/libunbound/unbound.h b/libunbound/unbound.h index ac747a7cc6cc..1b0f54fd2b6b 100644 --- a/libunbound/unbound.h +++ b/libunbound/unbound.h @@ -37,7 +37,7 @@ * \file * * This file contains functions to resolve DNS queries and - * validate the answers. Synchonously and asynchronously. + * validate the answers. Synchronously and asynchronously. * * Several ways to use this interface from an application wishing * to perform (validated) DNS lookups. @@ -177,7 +177,7 @@ struct ub_result { * False, if validation failed or domain queried has no security info. * * It is possible to get a result with no data (havedata is false), - * and secure is true. This means that the non-existance of the data + * and secure is true. This means that the non-existence of the data * was cryptographically proven (with signatures). */ int secure; @@ -623,6 +623,7 @@ struct ub_shm_stat_info { long long ipsecmod; long long respip; long long dnscrypt_shared_secret; + long long dnscrypt_nonce; } mem; }; @@ -742,11 +743,15 @@ struct ub_server_stats { long long num_query_dnscrypt_secret_missed_cache; /** number of dnscrypt shared secret cache entries */ long long shared_secret_cache_count; + /** number of queries which are replays */ + long long num_query_dnscrypt_replay; + /** number of dnscrypt nonces cache entries */ + long long nonce_cache_count; }; /** * Statistics to send over the control pipe when asked - * This struct is made to be memcpied, sent in binary. + * This struct is made to be memcopied, sent in binary. * shm mapped with (number+1) at num_threads+1, with first as total */ struct ub_stats_info { |