diff --git a/doc/Changelog b/doc/Changelog index cac2abbd1..ccc5c0158 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,3 +1,8 @@ +12 April 2017: Wouter + - subnet mem value is available in shm, also when not enabled, + to make the struct easier to memmap by other applications, + independent of the configuration of unbound. + 12 April 2017: Ralph - Fix #1247: unbound does not shorten source prefix length when forwarding ECS. diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c index bfe14f3d6..cab9aed56 100644 --- a/util/shm_side/shm_main.c +++ b/util/shm_side/shm_main.c @@ -262,8 +262,11 @@ void shm_main_run(struct worker *worker) fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); shm_stat->mem.iter = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack); } -#ifdef CLIENT_SUBNET + /* subnet mem value is available in shm, also when not enabled, + * to make the struct easier to memmap by other applications, + * independent of the configuration of unbound */ shm_stat->mem.subnet = 0; +#ifdef CLIENT_SUBNET modstack = modstack_find(&worker->env.mesh->mods, "subnet"); if(modstack != -1) { fptr_ok(fptr_whitelist_mod_get_mem(worker->env.mesh->mods.mod[modstack]->get_mem)); diff --git a/util/shm_side/shm_main.h b/util/shm_side/shm_main.h index 1ecac5560..8e4f4d051 100644 --- a/util/shm_side/shm_main.h +++ b/util/shm_side/shm_main.h @@ -61,9 +61,7 @@ struct shm_stat_info { size_t rrset; size_t val; size_t iter; -#ifdef CLIENT_SUBNET size_t subnet; -#endif } mem; };