upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-23 16:20:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix crash if ratelimit taken into use with unbound-control

Browse source 
instead of with unbound.conf.


git-svn-id: file:///svn/unbound/trunk@4711 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-06-05 07:06:19 +00:00
parent 62ea384d19
commit a4a5bfaa2f
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/Changelog
View file

@ -1,3 +1,7 @@
5 June 2018: Wouter
- Fix crash if ratelimit taken into use with unbound-control
instead of with unbound.conf.
4 June 2018: Wouter 4 June 2018: Wouter
- Fix deadlock caused by incoming notify for auth-zone. - Fix deadlock caused by incoming notify for auth-zone.
- tag for 1.7.2rc1 - tag for 1.7.2rc1

2
services/cache/infra.c vendored
View file

@ -232,7 +232,6 @@ infra_create(struct config_file* cfg)
infra->host_ttl = cfg->host_ttl; infra->host_ttl = cfg->host_ttl;
name_tree_init(&infra->domain_limits); name_tree_init(&infra->domain_limits);
infra_dp_ratelimit = cfg->ratelimit; infra_dp_ratelimit = cfg->ratelimit;
if(cfg->ratelimit != 0) {
infra->domain_rates = slabhash_create(cfg->ratelimit_slabs, infra->domain_rates = slabhash_create(cfg->ratelimit_slabs,
INFRA_HOST_STARTSIZE, cfg->ratelimit_size, INFRA_HOST_STARTSIZE, cfg->ratelimit_size,
&rate_sizefunc, &rate_compfunc, &rate_delkeyfunc, &rate_sizefunc, &rate_compfunc, &rate_delkeyfunc,
@ -247,7 +246,6 @@ infra_create(struct config_file* cfg)
return NULL; return NULL;
} }
name_tree_init_parents(&infra->domain_limits); name_tree_init_parents(&infra->domain_limits);
}
infra_ip_ratelimit = cfg->ip_ratelimit; infra_ip_ratelimit = cfg->ip_ratelimit;
infra->client_ip_rates = slabhash_create(cfg->ip_ratelimit_slabs, infra->client_ip_rates = slabhash_create(cfg->ip_ratelimit_slabs,
INFRA_HOST_STARTSIZE, cfg->ip_ratelimit_size, &ip_rate_sizefunc, INFRA_HOST_STARTSIZE, cfg->ip_ratelimit_size, &ip_rate_sizefunc,