hash: move string hash funcs into util files

diff --git a/src/Makefile.am b/src/Makefile.am
index 348a7dd6a8523f431b3bc4ad4aabf08c41503397..9ffa85b5a65194c3d4245e4babd87e9740e9da7e 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -435,6 +435,7 @@ util-fmemopen.c util-fmemopen.h \
 util-hash.c util-hash.h \
 util-hashlist.c util-hashlist.h \
 util-hash-lookup3.c util-hash-lookup3.h \
+util-hash-string.c util-hash-string.h \
 util-host-os-info.c util-host-os-info.h \
 util-host-info.c util-host-info.h \
 util-hyperscan.c util-hyperscan.h \

diff --git a/src/detect-metadata.c b/src/detect-metadata.c
index 3da60cfaab17f32e84922446ff5472b3619d9cfd..2a32ebf8d97dca62b9b399ee71db3457702d02cf 100644 (file)
--- a/src/detect-metadata.c
+++ b/src/detect-metadata.c
@@ -31,7 +31,7 @@
 #include "detect-parse.h"
 #include "detect-engine.h"
 #include "detect-metadata.h"
-
+#include "util-hash-string.h"
 #include "util-unittest.h"
 
 static int DetectMetadataSetup (DetectEngineCtx *, Signature *, const char *);
@@ -60,38 +60,6 @@ void DetectMetadataFree(DetectMetadata *mdata)
     SCReturn;
 }
 
-/* djb2 string hashing */
-static uint32_t StringHashFunc(HashTable *ht, void *data, uint16_t datalen)
-{
-    uint32_t hash = 5381;
-    int c;
-
-    while ((c = *(char *)data++))
-        hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
-
-    hash = hash % ht->array_size;
-
-    return hash;
-}
-
-static char StringHashCompareFunc(void *data1, uint16_t datalen1,
-                               void *data2, uint16_t datalen2)
-{
-    int len1 = strlen((char *)data1);
-    int len2 = strlen((char *)data2);
-
-    if (len1 == len2 && memcmp(data1, data2, len1) == 0) {
-        return 1;
-    }
-
-    return 0;
-}
-
-static void StringHashFreeFunc(void *data)
-{
-    SCFree(data);
-}
-
 int DetectMetadataHashInit(DetectEngineCtx *de_ctx)
 {
     if (! DetectEngineMustParseMetadata())

diff --git a/src/util-hash-string.c b/src/util-hash-string.c
new file mode 100644 (file)
index 0000000..ceb1b30
--- /dev/null
+++ b/src/util-hash-string.c
@@ -0,0 +1,52 @@
+/* Copyright (C) 2007-2017 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#include "suricata-common.h"
+#include "util-hash-string.h"
+
+/* djb2 string hashing */
+uint32_t StringHashFunc(HashTable *ht, void *data, uint16_t datalen)
+{
+    uint32_t hash = 5381;
+    int c;
+
+    while ((c = *(char *)data++))
+        hash = ((hash << 5) + hash) + c; /* hash * 33 + c */
+
+    hash = hash % ht->array_size;
+
+    return hash;
+}
+
+char StringHashCompareFunc(void *data1, uint16_t datalen1,
+                           void *data2, uint16_t datalen2)
+{
+    int len1 = strlen((char *)data1);
+    int len2 = strlen((char *)data2);
+
+    if (len1 == len2 && memcmp(data1, data2, len1) == 0) {
+        return 1;
+    }
+
+    return 0;
+}
+
+void StringHashFreeFunc(void *data)
+{
+    SCFree(data);
+}
+

diff --git a/src/util-hash-string.h b/src/util-hash-string.h
new file mode 100644 (file)
index 0000000..263b738
--- /dev/null
+++ b/src/util-hash-string.h
@@ -0,0 +1,26 @@
+/* Copyright (C) 2007-2017 Open Information Security Foundation
+ *
+ * You can copy, redistribute or modify this Program under the terms of
+ * the GNU General Public License version 2 as published by the Free
+ * Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ */
+
+#ifndef __UTIL_HASH_STRING_H__
+#define __UTIL_HASH_STRING_H__
+
+uint32_t StringHashFunc(HashTable *ht, void *data, uint16_t datalen);
+char StringHashCompareFunc(void *data1, uint16_t datalen1,
+                           void *data2, uint16_t datalen2);
+void StringHashFreeFunc(void *data);
+
+#endif /* __UTIL_HASH_STRING_H__ */