iprep: unify free handling

Introduce a new util function to free a Hosts iprep code. It also
handles the Host use_cnt decrement.

This change makes sure we also decrement the use_cnt when cleaning
up when shutting down the host table.

Move the BUG_ON check for use_cnt into the HostClearMemory() func
to check it in more cases.

(cherry picked from commit 172d2b28a58d923ddbc5644dd3bfb52e353b8a55)

diff --git a/src/host.c b/src/host.c
index 5480d1b4501b025995a02e881d5c43150812d98d..975c9bc36121505e3f20dac71dff0cd4a9fc59ad 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -156,12 +156,13 @@ error:
 void HostClearMemory(Host *h)
 {
     if (h->iprep != NULL) {
-        SCFree(h->iprep);
-        h->iprep = NULL;
+        SRepFreeHostData(h);
     }
 
     if (HostStorageSize() > 0)
         HostFreeStorage(h);
+
+    BUG_ON(SC_ATOMIC_GET(h->use_cnt) > 0);
 }
 
 #define HOST_DEFAULT_HASHSIZE 4096
@@ -311,7 +312,6 @@ void HostShutdown(void)
 
     /* free spare queue */
     while((h = HostDequeue(&host_spare_q))) {
-        BUG_ON(SC_ATOMIC_GET(h->use_cnt) > 0);
         HostFree(h);
     }
 

diff --git a/src/reputation.c b/src/reputation.c
index 663f573e9f669ea20f5cf3a335a9de5851a23e05..47dbeefdad7bfa61e8e609461d894aaf38e4cbf6 100644 (file)
--- a/src/reputation.c
+++ b/src/reputation.c
@@ -38,6 +38,7 @@
 #include "conf.h"
 #include "detect.h"
 #include "reputation.h"
+#include "util-validate.h"
 
 /** effective reputation version, atomic as the host
  *  time out code will use it to check if a host's
@@ -175,6 +176,14 @@ void SRepReloadComplete(void)
     SCLogDebug("effective Reputation version %u", SRepGetEffectiveVersion());
 }
 
+void SRepFreeHostData(Host *h)
+{
+    SCFree(h->iprep);
+    h->iprep = NULL;
+    DEBUG_VALIDATE_BUG_ON(SC_ATOMIC_GET(h->use_cnt) != 1);
+    HostDecrUsecnt(h);
+}
+
 /** \brief Set effective reputation version after
  *         reputation initialization is complete. */
 static void SRepInitComplete(void)
@@ -205,11 +214,7 @@ int SRepHostTimedOut(Host *h)
     if (r->version < eversion) {
         SCLogDebug("host %p has reputation version %u, "
                 "effective version is %u", h, r->version, eversion);
-
-        SCFree(h->iprep);
-        h->iprep = NULL;
-
-        HostDecrUsecnt(h);
+        SRepFreeHostData(h);
         return 1;
     }
 

diff --git a/src/reputation.h b/src/reputation.h
index 48d990ae00132f143f48d25613d26cc82289a10b..52c0756e80f769df227632e1d453d45c5fc09549 100644 (file)
--- a/src/reputation.h
+++ b/src/reputation.h
@@ -41,6 +41,7 @@ typedef struct SReputation_ {
     uint8_t rep[SREP_MAX_CATS];
 } SReputation;
 
+void SRepFreeHostData(Host *h);
 uint8_t SRepCatGetByShortname(char *shortname);
 int SRepInit(struct DetectEngineCtx_ *de_ctx);
 void SRepDestroy(struct DetectEngineCtx_ *de_ctx);