From: Ralph Dolmans <ralph@nlnetlabs.nl>
Date: Wed, 12 Apr 2017 13:51:34 +0000 (+0000)
Subject: - Set SHM ECS memory usage to 0 when module not loaded.
X-Git-Tag: release-1.6.2rc1~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4b39a9eaf803bc2bec771f9c3ba5aff487d8eeb8;p=thirdparty%2Funbound.git

- Set SHM ECS memory usage to 0 when module not loaded.


git-svn-id: file:///svn/unbound/trunk@4111 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/doc/Changelog b/doc/Changelog
index 0b09222b1..cac2abbd1 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -3,6 +3,7 @@
 	  forwarding ECS.
 	- Properly check for allocation failure in local_data_find_tag_datas.
 	- Fix #1249: unbound doesn't return FORMERR to bogus ECS.
+	- Set SHM ECS memory usage to 0 when module not loaded.
 
 11 April 2017: Ralph
 	- Display ECS module memory usage.
diff --git a/util/shm_side/shm_main.c b/util/shm_side/shm_main.c
index 32ba73f1e..bfe14f3d6 100644
--- a/util/shm_side/shm_main.c
+++ b/util/shm_side/shm_main.c
@@ -263,6 +263,7 @@ void shm_main_run(struct worker *worker)
 			shm_stat->mem.iter = (*worker->env.mesh->mods.mod[modstack]->get_mem)(&worker->env, modstack);
 		}
 #ifdef CLIENT_SUBNET
+		shm_stat->mem.subnet = 0;
 		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));