mirror of
https://github.com/NLnetLabs/unbound.git
synced 2025-12-28 18:39:35 -05:00
- Small fixes for #41: changelog, conflicts resolved,
processQueryResponse takes an iterator env argument like other functions in the iterator, no colon in string for set_option, and some whitespace style, to make it similar to the rest.
This commit is contained in:
W.C.A. Wijngaards
parent
b2cf56e0ec
commit
750f46d1aa
5 changed files with 791 additions and 777 deletions
|
|
@ -1,6 +1,10 @@
|
|||
8 September 2021: Wouter
|
||||
- Merged #41 from Moritz Schneider: made outbound-msg-retry
|
||||
configurable.
|
||||
- Small fixes for #41: changelog, conflicts resolved,
|
||||
processQueryResponse takes an iterator env argument like other
|
||||
functions in the iterator, no colon in string for set_option,
|
||||
and some whitespace style, to make it similar to the rest.
|
||||
|
||||
3 September 2021: Wouter
|
||||
- Fix #538: Fix subnetcache statistics.
|
||||
|
|
|
|||
|
|
@ -2725,6 +2725,7 @@ find_NS(struct reply_info* rep, size_t from, size_t to)
|
|||
*
|
||||
* @param qstate: query state.
|
||||
* @param iq: iterator query state.
|
||||
* @param ie: iterator shared global environment.
|
||||
* @param id: module id.
|
||||
* @return true if the event requires more immediate processing, false if
|
||||
* not. This is generally only true when forwarding the request to
|
||||
|
|
@ -2732,7 +2733,7 @@ find_NS(struct reply_info* rep, size_t from, size_t to)
|
|||
*/
|
||||
static int
|
||||
processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
|
||||
int id, size_t outbound_msg_retry)
|
||||
struct iter_env* ie, int id)
|
||||
{
|
||||
int dnsseclame = 0;
|
||||
enum response_type type;
|
||||
|
|
@ -3002,7 +3003,8 @@ processQueryResponse(struct module_qstate* qstate, struct iter_qstate* iq,
|
|||
}
|
||||
if(iq->store_parent_NS && query_dname_compare(iq->dp->name,
|
||||
iq->store_parent_NS->name) == 0)
|
||||
iter_merge_retry_counts(iq->dp, iq->store_parent_NS, outbound_msg_retry);
|
||||
iter_merge_retry_counts(iq->dp, iq->store_parent_NS,
|
||||
ie->outbound_msg_retry);
|
||||
delegpt_log(VERB_ALGO, iq->dp);
|
||||
/* Count this as a referral. */
|
||||
iq->referral_count++;
|
||||
|
|
@ -3746,8 +3748,7 @@ iter_handle(struct module_qstate* qstate, struct iter_qstate* iq,
|
|||
cont = processQueryTargets(qstate, iq, ie, id);
|
||||
break;
|
||||
case QUERY_RESP_STATE:
|
||||
cont = processQueryResponse(
|
||||
qstate, iq, id, ie->outbound_msg_retry);
|
||||
cont = processQueryResponse(qstate, iq, ie, id);
|
||||
break;
|
||||
case PRIME_RESP_STATE:
|
||||
cont = processPrimeResponse(qstate, id);
|
||||
|
|
|
|||
|
|
@ -753,7 +753,7 @@ int config_set_option(struct config_file* cfg, const char* opt,
|
|||
else S_POW2("ratelimit-slabs:", ratelimit_slabs)
|
||||
else S_NUMBER_OR_ZERO("ip-ratelimit-factor:", ip_ratelimit_factor)
|
||||
else S_NUMBER_OR_ZERO("ratelimit-factor:", ratelimit_factor)
|
||||
else S_SIZET_NONZERO("outbound-msg-retry", outbound_msg_retry)
|
||||
else S_SIZET_NONZERO("outbound-msg-retry:", outbound_msg_retry)
|
||||
else S_SIZET_NONZERO("fast-server-num:", fast_server_num)
|
||||
else S_NUMBER_OR_ZERO("fast-server-permil:", fast_server_permil)
|
||||
else S_YNO("qname-minimisation:", qname_minimisation)
|
||||
|
|
|
|||
1447
util/configparser.c
1447
util/configparser.c
File diff suppressed because it is too large
Load diff
|
|
@ -319,8 +319,9 @@ stubstart: VAR_STUB_ZONE
|
|||
if(s) {
|
||||
s->next = cfg_parser->cfg->stubs;
|
||||
cfg_parser->cfg->stubs = s;
|
||||
} else
|
||||
} else {
|
||||
yyerror("out of memory");
|
||||
}
|
||||
}
|
||||
;
|
||||
contents_stub: contents_stub content_stub
|
||||
|
|
@ -336,8 +337,9 @@ forwardstart: VAR_FORWARD_ZONE
|
|||
if(s) {
|
||||
s->next = cfg_parser->cfg->forwards;
|
||||
cfg_parser->cfg->forwards = s;
|
||||
} else
|
||||
} else {
|
||||
yyerror("out of memory");
|
||||
}
|
||||
}
|
||||
;
|
||||
contents_forward: contents_forward content_forward
|
||||
|
|
@ -355,8 +357,9 @@ viewstart: VAR_VIEW
|
|||
if(s->next && !s->next->name)
|
||||
yyerror("view without name");
|
||||
cfg_parser->cfg->views = s;
|
||||
} else
|
||||
} else {
|
||||
yyerror("out of memory");
|
||||
}
|
||||
}
|
||||
;
|
||||
contents_view: contents_view content_view
|
||||
|
|
@ -379,8 +382,9 @@ authstart: VAR_AUTH_ZONE
|
|||
s->zonemd_check = 0;
|
||||
s->zonemd_reject_absence = 0;
|
||||
s->isrpz = 0;
|
||||
} else
|
||||
} else {
|
||||
yyerror("out of memory");
|
||||
}
|
||||
}
|
||||
;
|
||||
contents_auth: contents_auth content_auth
|
||||
|
|
@ -465,8 +469,9 @@ rpzstart: VAR_RPZ
|
|||
s->for_upstream = 0;
|
||||
s->fallback_enabled = 0;
|
||||
s->isrpz = 1;
|
||||
} else
|
||||
} else {
|
||||
yyerror("out of memory");
|
||||
}
|
||||
}
|
||||
;
|
||||
contents_rpz: contents_rpz content_rpz
|
||||
|
|
@ -1490,9 +1495,9 @@ server_msg_cache_size: VAR_MSG_CACHE_SIZE STRING_ARG
|
|||
server_msg_cache_slabs: VAR_MSG_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_msg_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->msg_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->msg_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -1567,9 +1572,9 @@ server_rrset_cache_size: VAR_RRSET_CACHE_SIZE STRING_ARG
|
|||
server_rrset_cache_slabs: VAR_RRSET_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_rrset_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->rrset_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->rrset_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -1614,9 +1619,9 @@ server_infra_cache_lame_size: VAR_INFRA_CACHE_LAME_SIZE STRING_ARG
|
|||
server_infra_cache_slabs: VAR_INFRA_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_infra_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->infra_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->infra_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -2116,9 +2121,9 @@ server_key_cache_size: VAR_KEY_CACHE_SIZE STRING_ARG
|
|||
server_key_cache_slabs: VAR_KEY_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_key_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->key_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->key_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -2390,7 +2395,6 @@ server_ip_ratelimit: VAR_IP_RATELIMIT STRING_ARG
|
|||
free($2);
|
||||
}
|
||||
;
|
||||
|
||||
server_ratelimit: VAR_RATELIMIT STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ratelimit:%s)\n", $2));
|
||||
|
|
@ -2401,13 +2405,13 @@ server_ratelimit: VAR_RATELIMIT STRING_ARG
|
|||
}
|
||||
;
|
||||
server_ip_ratelimit_size: VAR_IP_RATELIMIT_SIZE STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ip_ratelimit_size:%s)\n", $2));
|
||||
if(!cfg_parse_memsize($2, &cfg_parser->cfg->ip_ratelimit_size))
|
||||
yyerror("memory size expected");
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
{
|
||||
OUTYY(("P(server_ip_ratelimit_size:%s)\n", $2));
|
||||
if(!cfg_parse_memsize($2, &cfg_parser->cfg->ip_ratelimit_size))
|
||||
yyerror("memory size expected");
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ratelimit_size:%s)\n", $2));
|
||||
|
|
@ -2417,24 +2421,24 @@ server_ratelimit_size: VAR_RATELIMIT_SIZE STRING_ARG
|
|||
}
|
||||
;
|
||||
server_ip_ratelimit_slabs: VAR_IP_RATELIMIT_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
yyerror("number expected");
|
||||
else {
|
||||
cfg_parser->cfg->ip_ratelimit_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
{
|
||||
OUTYY(("P(server_ip_ratelimit_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
} else {
|
||||
cfg_parser->cfg->ip_ratelimit_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->ip_ratelimit_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
}
|
||||
free($2);
|
||||
}
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
;
|
||||
server_ratelimit_slabs: VAR_RATELIMIT_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ratelimit_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->ratelimit_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->ratelimit_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -2474,11 +2478,11 @@ server_ratelimit_below_domain: VAR_RATELIMIT_BELOW_DOMAIN STRING_ARG STRING_ARG
|
|||
;
|
||||
server_ip_ratelimit_factor: VAR_IP_RATELIMIT_FACTOR STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_ip_ratelimit_factor:%s)\n", $2));
|
||||
if(atoi($2) == 0 && strcmp($2, "0") != 0)
|
||||
yyerror("number expected");
|
||||
else cfg_parser->cfg->ip_ratelimit_factor = atoi($2);
|
||||
free($2);
|
||||
OUTYY(("P(server_ip_ratelimit_factor:%s)\n", $2));
|
||||
if(atoi($2) == 0 && strcmp($2, "0") != 0)
|
||||
yyerror("number expected");
|
||||
else cfg_parser->cfg->ip_ratelimit_factor = atoi($2);
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG
|
||||
|
|
@ -2491,14 +2495,14 @@ server_ratelimit_factor: VAR_RATELIMIT_FACTOR STRING_ARG
|
|||
}
|
||||
;
|
||||
server_outbound_msg_retry: VAR_OUTBOUND_MSG_RETRY STRING_ARG
|
||||
{
|
||||
OUTYY(("P(server_outbound_msg_retry:%s)\n", $2));
|
||||
if(atoi($2) == 0 && strcmp($2, "0") != 0)
|
||||
yyerror("number expected");
|
||||
else cfg_parser->cfg->outbound_msg_retry = atoi($2);
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
{
|
||||
OUTYY(("P(server_outbound_msg_retry:%s)\n", $2));
|
||||
if(atoi($2) == 0 && strcmp($2, "0") != 0)
|
||||
yyerror("number expected");
|
||||
else cfg_parser->cfg->outbound_msg_retry = atoi($2);
|
||||
free($2);
|
||||
}
|
||||
;
|
||||
server_low_rtt: VAR_LOW_RTT STRING_ARG
|
||||
{
|
||||
OUTYY(("P(low-rtt option is deprecated, use fast-server-num instead)\n"));
|
||||
|
|
@ -3405,9 +3409,9 @@ dnsc_dnscrypt_shared_secret_cache_size: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SIZE ST
|
|||
dnsc_dnscrypt_shared_secret_cache_slabs: VAR_DNSCRYPT_SHARED_SECRET_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(dnscrypt_shared_secret_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->dnscrypt_shared_secret_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
@ -3426,9 +3430,9 @@ dnsc_dnscrypt_nonce_cache_size: VAR_DNSCRYPT_NONCE_CACHE_SIZE STRING_ARG
|
|||
dnsc_dnscrypt_nonce_cache_slabs: VAR_DNSCRYPT_NONCE_CACHE_SLABS STRING_ARG
|
||||
{
|
||||
OUTYY(("P(dnscrypt_nonce_cache_slabs:%s)\n", $2));
|
||||
if(atoi($2) == 0)
|
||||
if(atoi($2) == 0) {
|
||||
yyerror("number expected");
|
||||
else {
|
||||
} else {
|
||||
cfg_parser->cfg->dnscrypt_nonce_cache_slabs = atoi($2);
|
||||
if(!is_pow2(cfg_parser->cfg->dnscrypt_nonce_cache_slabs))
|
||||
yyerror("must be a power of 2");
|
||||
|
|
|
|||
Loading…
Reference in a new issue