variable names global vars, global no more. Moved to detection engine ctx, a place...

diff --git a/src/alert-debuglog.c b/src/alert-debuglog.c
index 1029e621f2388ea33d944dc18f1e53258954ebbf..19166bebf03cdc1d2cf7c0a2e764807a182133e4 100644 (file)
--- a/src/alert-debuglog.c
+++ b/src/alert-debuglog.c
@@ -145,12 +145,7 @@ static void AlertDebugLogFlowBits(AlertDebugLogThread *aft, Packet *p)
     while (gv != NULL) {
         if (gv->type == DETECT_FLOWBITS) {
             FlowBit *fb = (FlowBit *) gv;
-            char *name = VariableIdxGetName(fb->idx, fb->type);
-            if (name != NULL) {
-                MemBufferWriteString(aft->buffer, "FLOWBIT:           %s\n",
-                                     name);
-                SCFree(name);
-            }
+            MemBufferWriteString(aft->buffer, "FLOWBIT idx(%"PRIu32")\n", fb->idx);
         }
         gv = gv->next;
     }

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 10f63cdbda9568c35a1e6a28c20bed7eb70d0600..142480750d49886132eda4954cbef264ceb2ed96 100644 (file)
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -123,7 +123,7 @@ DetectEngineCtx *DetectEngineCtxInit(void) {
     DetectPortSpHashInit(de_ctx);
     DetectPortDpHashInit(de_ctx);
     ThresholdHashInit(de_ctx);
-    VariableNameInitHash();
+    VariableNameInitHash(de_ctx);
     DetectParseDupSigHashInit(de_ctx);
 
     de_ctx->mpm_pattern_id_store = MpmPatternIdTableInitHash();
@@ -159,7 +159,7 @@ void DetectEngineCtxFree(DetectEngineCtx *de_ctx) {
     ThresholdContextDestroy(de_ctx);
     SigCleanSignatures(de_ctx);
 
-    VariableNameFreeHash();
+    VariableNameFreeHash(de_ctx);
     if (de_ctx->sig_array)
         SCFree(de_ctx->sig_array);
 

diff --git a/src/detect-flowbits.c b/src/detect-flowbits.c
index 38dc6186e4e75a8b053d68363af42c057a58b531..30c13497f98f25774ae25a3219febf2664a8fd94 100644 (file)
--- a/src/detect-flowbits.c
+++ b/src/detect-flowbits.c
@@ -229,7 +229,7 @@ int DetectFlowbitSetup (DetectEngineCtx *de_ctx, Signature *s, char *rawstr)
     if (cd == NULL)
         goto error;
 
-    cd->idx = VariableNameGetIdx(fb_name,DETECT_FLOWBITS);
+    cd->idx = VariableNameGetIdx(de_ctx, fb_name, DETECT_FLOWBITS);
     cd->cmd = fb_cmd;
 
     SCLogDebug("idx %" PRIu32 ", cmd %s, name %s",
@@ -609,7 +609,7 @@ static int FlowBitsTestSig04(void) {
 
     s = de_ctx->sig_list = SigInit(de_ctx,"alert ip any any -> any any (msg:\"isset option\"; flowbits:isset,fbt; content:\"GET \"; sid:1;)");
 
-    idx = VariableNameGetIdx("fbt",DETECT_FLOWBITS);
+    idx = VariableNameGetIdx(de_ctx, "fbt", DETECT_FLOWBITS);
 
     if (s == NULL || idx != 1) {
         goto end;
@@ -790,7 +790,7 @@ static int FlowBitsTestSig06(void) {
 
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
 
-    idx = VariableNameGetIdx("myflow",DETECT_FLOWBITS);
+    idx = VariableNameGetIdx(de_ctx, "myflow", DETECT_FLOWBITS);
 
     gv = p->flow->flowvar;
 
@@ -896,7 +896,7 @@ static int FlowBitsTestSig07(void) {
 
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
 
-    idx = VariableNameGetIdx("myflow",DETECT_FLOWBITS);
+    idx = VariableNameGetIdx(de_ctx, "myflow", DETECT_FLOWBITS);
 
     gv = p->flow->flowvar;
 
@@ -1005,7 +1005,7 @@ static int FlowBitsTestSig08(void) {
 
     SigMatchSignatures(&th_v, de_ctx, det_ctx, p);
 
-    idx = VariableNameGetIdx("myflow",DETECT_FLOWBITS);
+    idx = VariableNameGetIdx(de_ctx, "myflow", DETECT_FLOWBITS);
 
     gv = p->flow->flowvar;
 

diff --git a/src/detect-flowint.c b/src/detect-flowint.c
index 46db492b9a25da692a56fb8e8d286b45b2c179ad..2798c272e816c1a8b13b2a3a2824b159548b5306 100644 (file)
--- a/src/detect-flowint.c
+++ b/src/detect-flowint.c
@@ -115,7 +115,7 @@ int DetectFlowintMatch(ThreadVars *t, DetectEngineThreadCtx *det_ctx,
      * return zero(not match).
      */
     if (sfd->targettype == FLOWINT_TARGET_VAR) {
-        sfd->target.tvar.idx = VariableNameGetIdx(sfd->target.tvar.name, DETECT_FLOWINT);
+        sfd->target.tvar.idx = VariableNameGetIdx(det_ctx->de_ctx, sfd->target.tvar.name, DETECT_FLOWINT);
 
         fvt = FlowVarGet(p->flow, sfd->target.tvar.idx);
             /* We don't have that variable initialized yet */
@@ -335,7 +335,7 @@ DetectFlowintData *DetectFlowintParse(DetectEngineCtx *de_ctx,
     /* Set the name of the origin var to modify/compared with the target */
     sfd->name = SCStrdup(varname);
     if (de_ctx != NULL)
-        sfd->idx = VariableNameGetIdx(varname, DETECT_FLOWINT);
+        sfd->idx = VariableNameGetIdx(de_ctx, varname, DETECT_FLOWINT);
     sfd->target.value =(uint32_t) value_long;
 
     sfd->modifier = modifier;

diff --git a/src/detect-flowvar.c b/src/detect-flowvar.c
index bfd64fe1b0370197b4892e4ebb49b01cd75319f9..ed7e7de135969bf7e2ae9641e14ac15b2ad6f1da 100644 (file)
--- a/src/detect-flowvar.c
+++ b/src/detect-flowvar.c
@@ -222,7 +222,7 @@ static int DetectFlowvarSetup (DetectEngineCtx *de_ctx, Signature *s, char *raws
     }
 
     cd->name = SCStrdup(varname);
-    cd->idx = VariableNameGetIdx(varname,DETECT_FLOWVAR);
+    cd->idx = VariableNameGetIdx(de_ctx, varname, DETECT_FLOWVAR);
     memcpy(cd->content, str, len);
     cd->content_len = len;
     cd->flags = 0;

diff --git a/src/detect-pcre.c b/src/detect-pcre.c
index cc7d671122af935952fa15ff9966235e86f8c2c4..50337eb6b9e1e95bb68866b6c33674eaa5d2ee54 100644 (file)
--- a/src/detect-pcre.c
+++ b/src/detect-pcre.c
@@ -1054,9 +1054,9 @@ DetectPcreData *DetectPcreParseCapture(char *regexstr, DetectEngineCtx *de_ctx,
         }
         if (capture_str_ptr != NULL) {
             if (pd->flags & DETECT_PCRE_CAPTURE_PKT)
-                pd->capidx = VariableNameGetIdx((char *)capture_str_ptr,DETECT_PKTVAR);
+                pd->capidx = VariableNameGetIdx(de_ctx, (char *)capture_str_ptr, DETECT_PKTVAR);
             else if (pd->flags & DETECT_PCRE_CAPTURE_FLOW)
-                pd->capidx = VariableNameGetIdx((char *)capture_str_ptr,DETECT_FLOWVAR);
+                pd->capidx = VariableNameGetIdx(de_ctx, (char *)capture_str_ptr, DETECT_FLOWVAR);
         }
     }
     //printf("DetectPcreParseCapture: pd->capname %s\n", pd->capname ? pd->capname : "NULL");

diff --git a/src/detect.h b/src/detect.h
index 88fa1d0174b8bbd9a7905d06d792780c5516531e..8239a30265584c96ecde3bc1f2d39558668e7df4 100644 (file)
--- a/src/detect.h
+++ b/src/detect.h
@@ -571,6 +571,10 @@ typedef struct DetectEngineCtx_ {
     HashListTable *sport_hash_table;
     HashListTable *dport_hash_table;
 
+    HashListTable *variable_names;
+    HashListTable *variable_idxs;
+    uint16_t variable_names_idx;
+
     /* hash table used to cull out duplicate sigs */
     HashListTable *dup_sig_hash_table;
 

diff --git a/src/util-var-name.c b/src/util-var-name.c
index 619415911338444a996643b06dd1a40b71836384..cbad0a1c396f08383abd0772b8d522f6e12491d5 100644 (file)
--- a/src/util-var-name.c
+++ b/src/util-var-name.c
@@ -27,10 +27,6 @@
 #include "detect.h"
 #include "util-hashlist.h"
 
-HashListTable *variable_names;
-HashListTable *variable_idxs;
-uint16_t variable_names_idx;
-
 /** \brief Name2idx mapping structure for flowbits, flowvars and pktvars. */
 typedef struct VariableName_ {
     char *name;
@@ -104,26 +100,28 @@ static void VariableNameFree(void *data) {
  *  \retval -1 in case of error
  *  \retval 0 in case of success
  */
-int VariableNameInitHash() {
-    variable_names = HashListTableInit(4096, VariableNameHash, VariableNameCompare, VariableNameFree);
-    if (variable_names == NULL)
+int VariableNameInitHash(DetectEngineCtx *de_ctx) {
+    de_ctx->variable_names = HashListTableInit(4096, VariableNameHash, VariableNameCompare, VariableNameFree);
+    if (de_ctx->variable_names == NULL)
         return -1;
 
-    variable_idxs = HashListTableInit(4096, VariableIdxHash, VariableIdxCompare, NULL);
-    if (variable_idxs == NULL)
+    de_ctx->variable_idxs = HashListTableInit(4096, VariableIdxHash, VariableIdxCompare, NULL);
+    if (de_ctx->variable_idxs == NULL)
         return -1;
 
-    variable_names_idx = 0;
+    de_ctx->variable_names_idx = 0;
     return 0;
 }
 
-void VariableNameFreeHash() {
-    if (variable_names != NULL) {
-        HashListTableFree(variable_names);
-        HashListTableFree(variable_idxs);
-        variable_names = NULL;
-        variable_idxs = NULL;
+void VariableNameFreeHash(DetectEngineCtx *de_ctx) {
+    if (de_ctx->variable_names != NULL) {
+        HashListTableFree(de_ctx->variable_names);
+        HashListTableFree(de_ctx->variable_idxs);
+        de_ctx->variable_names = NULL;
+        de_ctx->variable_idxs = NULL;
     }
+
+    return;
 }
 
 /** \brief Get a name idx for a name. If the name is already used reuse the idx.
@@ -132,7 +130,7 @@ void VariableNameFreeHash() {
  *  \retval 0 in case of error
  *  \retval _ the idx.
  */
-uint16_t VariableNameGetIdx(char *name, uint8_t type) {
+uint16_t VariableNameGetIdx(DetectEngineCtx *de_ctx, char *name, uint8_t type) {
     uint16_t idx = 0;
 
     VariableName *fn = SCMalloc(sizeof(VariableName));
@@ -146,13 +144,13 @@ uint16_t VariableNameGetIdx(char *name, uint8_t type) {
     if (fn->name == NULL)
         goto error;
 
-    VariableName *lookup_fn = (VariableName *)HashListTableLookup(variable_names, (void *)fn, 0);
+    VariableName *lookup_fn = (VariableName *)HashListTableLookup(de_ctx->variable_names, (void *)fn, 0);
     if (lookup_fn == NULL) {
-        variable_names_idx++;
+        de_ctx->variable_names_idx++;
 
-        idx = fn->idx = variable_names_idx;
-        HashListTableAdd(variable_names, (void *)fn, 0);
-        HashListTableAdd(variable_idxs, (void *)fn, 0);
+        idx = fn->idx = de_ctx->variable_names_idx;
+        HashListTableAdd(de_ctx->variable_names, (void *)fn, 0);
+        HashListTableAdd(de_ctx->variable_idxs, (void *)fn, 0);
     } else {
         idx = lookup_fn->idx;
         VariableNameFree(fn);
@@ -170,7 +168,7 @@ error:
  *  \retval NULL in case of error
  *  \retval name of the variable if successful.
  */
-char *VariableIdxGetName(uint16_t idx, uint8_t type)
+char *VariableIdxGetName(DetectEngineCtx *de_ctx, uint16_t idx, uint8_t type)
 {
     VariableName *fn = SCMalloc(sizeof(VariableName));
     if (fn == NULL)
@@ -182,7 +180,7 @@ char *VariableIdxGetName(uint16_t idx, uint8_t type)
     fn->type = type;
     fn->idx = idx;
 
-    VariableName *lookup_fn = (VariableName *)HashListTableLookup(variable_idxs, (void *)fn, 0);
+    VariableName *lookup_fn = (VariableName *)HashListTableLookup(de_ctx->variable_idxs, (void *)fn, 0);
     if (lookup_fn != NULL) {
         name = SCStrdup(lookup_fn->name);
         if (name == NULL)

diff --git a/src/util-var-name.h b/src/util-var-name.h
index 62b8984e7d55e5453d6a9783d3ed9c7037017c53..10bd4165c3142090becf2c8ec96126e752bcbed5 100644 (file)
--- a/src/util-var-name.h
+++ b/src/util-var-name.h
@@ -24,11 +24,11 @@
 #ifndef __UTIL_VAR_NAME_H__
 #define __UTIL_VAR_NAME_H__
 
-int VariableNameInitHash();
-void VariableNameFreeHash();
+int VariableNameInitHash(DetectEngineCtx *);
+void VariableNameFreeHash(DetectEngineCtx *);
 
-uint16_t VariableNameGetIdx(char *, uint8_t);
-char * VariableIdxGetName(uint16_t , uint8_t);
+uint16_t VariableNameGetIdx(DetectEngineCtx *, char *, uint8_t);
+char * VariableIdxGetName(DetectEngineCtx *, uint16_t , uint8_t);
 
 #endif