Move Host Tag storage to Host Storage API.

diff --git a/src/detect-engine-tag.c b/src/detect-engine-tag.c
index 63d930a71d50a867f706f7ce02b67bf273400e8e..8979d940a0a15509e786e87bb3942aeb702a3f0e 100644 (file)
--- a/src/detect-engine-tag.c
+++ b/src/detect-engine-tag.c
@@ -33,13 +33,17 @@
 #include "detect-engine-tag.h"
 #include "detect-tag.h"
 #include "host.h"
+#include "host-storage.h"
 
 SC_ATOMIC_DECLARE(unsigned int, num_tags);  /**< Atomic counter, to know if we
                                                  have tagged hosts/sessions,
                                                  to avoid locking */
+static int tag_id = 0;                      /**< Host storage id for tags */
 
 void TagInitCtx(void) {
     SC_ATOMIC_INIT(num_tags);
+
+    tag_id = HostStorageRegister("tag", sizeof(void *), NULL, DetectTagDataListFree);
 }
 
 /**
@@ -63,6 +67,18 @@ void TagRestartCtx() {
     TagInitCtx();
 }
 
+int TagHostHasTag(Host *host) {
+    return HostGetStorageById(host, tag_id) ? 1 : 0;
+}
+
+void DetectTagForceCleanup(Host *host) {
+    void *tag = HostGetStorageById(host, tag_id);
+    if (tag != NULL) {
+        DetectTagDataListFree(tag);
+        HostSetStorageById(host, tag_id, NULL);
+    }
+}
+
 static DetectTagDataEntry *DetectTagDataCopy(DetectTagDataEntry *dtd) {
     DetectTagDataEntry *tde = SCMalloc(sizeof(DetectTagDataEntry));
     if (unlikely(tde == NULL)) {
@@ -173,11 +189,12 @@ int TagHashAddTag(DetectTagDataEntry *tde, Packet *p)
         return -1;
     }
 
-    if (host->tag == NULL) {
+    void *tag = HostGetStorageById(host, tag_id);
+    if (tag == NULL) {
         /* get a new tde as the one we have is on the stack */
         DetectTagDataEntry *new_tde = DetectTagDataCopy(tde);
         if (new_tde != NULL) {
-            host->tag = new_tde;
+            HostSetStorageById(host, tag_id, new_tde);
             (void) SC_ATOMIC_ADD(num_tags, 1);
         }
     } else {
@@ -186,7 +203,7 @@ int TagHashAddTag(DetectTagDataEntry *tde, Packet *p)
         /* First iterate installed entries searching a duplicated sid/gid */
         DetectTagDataEntry *iter = NULL;
 
-        for (iter = host->tag; iter != NULL; iter = iter->next) {
+        for (iter = tag; iter != NULL; iter = iter->next) {
             num_tags++;
             if (iter->sid == tde->sid && iter->gid == tde->gid) {
                 iter->cnt_match++;
@@ -210,8 +227,8 @@ int TagHashAddTag(DetectTagDataEntry *tde, Packet *p)
             if (new_tde != NULL) {
                 (void) SC_ATOMIC_ADD(num_tags, 1);
 
-                new_tde->next = host->tag;
-                host->tag = new_tde;
+                new_tde->next = tag;
+                HostSetStorageById(host, tag_id, new_tde);
             }
         } else if (num_tags == DETECT_TAG_MAX_TAGS) {
             SCLogDebug("Max tags for sessions reached (%"PRIu16")", num_tags);
@@ -342,7 +359,7 @@ void TagHandlePacketHost(Host *host, Packet *p) {
     DetectTagDataEntry *iter;
     uint8_t flag_added = 0;
 
-    iter = host->tag;
+    iter = HostGetStorageById(host, tag_id);
     prev = NULL;
     while (iter != NULL) {
         /* update counters */
@@ -378,7 +395,7 @@ void TagHandlePacketHost(Host *host, Packet *p) {
                             iter = iter->next;
                             SCFree(tde);
                             (void) SC_ATOMIC_SUB(num_tags, 1);
-                            host->tag = iter;
+                            HostSetStorageById(host, tag_id, iter);
                             continue;
                         }
                     } else if (flag_added == 0) {
@@ -403,7 +420,7 @@ void TagHandlePacketHost(Host *host, Packet *p) {
                             iter = iter->next;
                             SCFree(tde);
                             (void) SC_ATOMIC_SUB(num_tags, 1);
-                            host->tag = iter;
+                            HostSetStorageById(host, tag_id, iter);
                             continue;
                         }
                     } else if (flag_added == 0) {
@@ -430,7 +447,7 @@ void TagHandlePacketHost(Host *host, Packet *p) {
                             iter = iter->next;
                             SCFree(tde);
                             (void) SC_ATOMIC_SUB(num_tags, 1);
-                            host->tag = iter;
+                            HostSetStorageById(host, tag_id, iter);
                             continue;
                         }
                     } else if (flag_added == 0) {
@@ -474,14 +491,14 @@ void TagHandlePacket(DetectEngineCtx *de_ctx,
 
     Host *src = HostLookupHostFromHash(&p->src);
     if (src) {
-        if (src->tag != NULL) {
+        if (TagHostHasTag(src)) {
             TagHandlePacketHost(src,p);
         }
         HostRelease(src);
     }
     Host *dst = HostLookupHostFromHash(&p->dst);
     if (dst) {
-        if (dst->tag != NULL) {
+        if (TagHostHasTag(dst)) {
             TagHandlePacketHost(dst,p);
         }
         HostRelease(dst);
@@ -504,11 +521,10 @@ int TagTimeoutCheck(Host *host, struct timeval *tv)
     DetectTagDataEntry *prev = NULL;
     int retval = 1;
 
-    if (host->tag == NULL)
+    tmp = HostGetStorageById(host, tag_id);
+    if (tmp == NULL)
         return 1;
 
-    tmp = host->tag;
-
     prev = NULL;
     while (tmp != NULL) {
         if ((tv->tv_sec - tmp->last_ts) <= TAG_MAX_LAST_TIME_SEEN) {
@@ -529,7 +545,7 @@ int TagTimeoutCheck(Host *host, struct timeval *tv)
             SCFree(tde);
             (void) SC_ATOMIC_SUB(num_tags, 1);
         } else {
-            host->tag = tmp->next;
+            HostSetStorageById(host, tag_id, tmp->next);
 
             tde = tmp;
             tmp = tde->next;

diff --git a/src/detect-engine-tag.h b/src/detect-engine-tag.h
index aada77a2111543a0a267029a70e44d211a7fa4f3..75693fa535c11b3f221d15c73823c8ed95832a28 100644 (file)
--- a/src/detect-engine-tag.h
+++ b/src/detect-engine-tag.h
@@ -54,6 +54,9 @@ void TagRestartCtx(void);
 
 int TagTimeoutCheck(Host *, struct timeval *);
 
+void DetectTagForceCleanup(Host *);
+int TagHostHasTag(Host *host);
+
 #endif /* __DETECT_ENGINE_TAG_H__ */
 
 

diff --git a/src/host-timeout.c b/src/host-timeout.c
index 3cedb80beba882862ac0175126d43b3b835aeec2..8b596e0dc54e4b0d4585fd8139368811e3c5717e 100644 (file)
--- a/src/host-timeout.c
+++ b/src/host-timeout.c
@@ -62,7 +62,7 @@ static int HostHostTimedOut(Host *h, struct timeval *ts) {
         SCLogDebug("host %p reputation timed out", h);
     }
 
-    if (h->tag && TagTimeoutCheck(h, ts) == 0) {
+    if (TagHostHasTag(h) && TagTimeoutCheck(h, ts) == 0) {
         tags = 1;
     }
     if (h->threshold && ThresholdTimeoutCheck(h, ts) == 0) {

diff --git a/src/host.c b/src/host.c
index 4661ca589c5b95e686218c24227d3e1682b7ab0b..954b88bdfb39e5aab8625085730ba914137bb48d 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -37,6 +37,7 @@
 #include "host-queue.h"
 
 #include "detect-tag.h"
+#include "detect-engine-tag.h"
 #include "detect-engine-threshold.h"
 
 #include "util-hash-lookup3.h"
@@ -104,10 +105,6 @@ error:
 }
 
 void HostClearMemory(Host *h) {
-    if (h->tag != NULL) {
-        DetectTagDataListFree(h->tag);
-        h->tag = NULL;
-    }
     if (h->threshold != NULL) {
         ThresholdListFree(h->threshold);
         h->threshold = NULL;
@@ -309,10 +306,8 @@ void HostCleanup(void)
             while (h) {
                 if ((SC_ATOMIC_GET(h->use_cnt) > 0) && (h->iprep != NULL)) {
                     /* iprep is attached to host only clear tag and threshold */
-                    if (h->tag != NULL) {
-                        DetectTagDataListFree(h->tag);
-                        h->tag = NULL;
-                    }
+                    DetectTagForceCleanup(h);
+
                     if (h->threshold != NULL) {
                         ThresholdListFree(h->threshold);
                         h->threshold = NULL;

diff --git a/src/host.h b/src/host.h
index 293577691302478f9955dfade16b69ad3897fedf..7f4584b616b306f4ca476f4973db74b1cf785a0c 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -65,8 +65,7 @@ typedef struct Host_ {
     /** use cnt, reference counter */
     SC_ATOMIC_DECLARE(unsigned short, use_cnt);
 
-    /** pointers to tag and threshold storage */
-    void *tag;
+    /** pointers to threshold and iprep storage */
     void *threshold;
     void *iprep;
     /** storage api handle */