host: use storage api

diff --git a/src/Makefile.am b/src/Makefile.am
index c672b05297efd47fdb028427cea64fa3c0e031e6..b28643401dd9907524d1e5dc6173f1e7649d2e26 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -197,6 +197,7 @@ flow-util.c flow-util.h \
 flow-var.c flow-var.h \
 host.c host.h \
 host-queue.c host-queue.h \
+host-storage.c host-storage.h \
 host-timeout.c host-timeout.h \
 log-dnslog.c log-dnslog.h \
 log-droplog.c log-droplog.h \

diff --git a/src/host-storage.c b/src/host-storage.c
new file mode 100644 (file)
index 0000000..3bcbfbe
--- /dev/null
+++ b/src/host-storage.c
@@ -0,0 +1,54 @@
+/* Copyright (C) 2007-2013 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.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ *
+ * Host wrapper around storage api
+ */
+
+#include "suricata-common.h"
+#include "host-storage.h"
+#include "util-unittests.h"
+
+void *HostGetStorageById(Host *h, int id) {
+    return StorageGetById(h->storage, STORAGE_HOST, id);
+}
+
+void *HostAllocStorageById(Host *h, int id) {
+    return StorageAllocById(&h->storage, STORAGE_HOST, id);
+}
+
+void HostFreeStorageById(Host *h, int id) {
+    StorageFreeById(h->storage, STORAGE_HOST, id);
+}
+
+void HostFreeStorage(Host *h) {
+    StorageFree(&h->storage, STORAGE_HOST);
+}
+
+#ifdef UNITTESTS
+
+#endif
+
+void RegisterHostStorageTests(void) {
+#ifdef UNITTESTS
+
+#endif
+}

diff --git a/src/host-storage.h b/src/host-storage.h
new file mode 100644 (file)
index 0000000..4905744
--- /dev/null
+++ b/src/host-storage.h
@@ -0,0 +1,33 @@
+/* Copyright (C) 2007-2013 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.
+ */
+
+/**
+ * \file
+ *
+ * \author Victor Julien <victor@inliniac.net>
+ *
+ * Host wrapper around storage api
+ */
+
+#include "util-storage.h"
+#include "host.h"
+
+void *HostGetStorageById(Host *h, int id);
+void *HostAllocStorageById(Host *h, int id);
+
+void HostFreeStorageById(Host *h, int id);
+void HostFreeStorage(Host *h);

diff --git a/src/host.h b/src/host.h
index 49b3b7280db5831c73073de1ace72b5f017c8c30..293577691302478f9955dfade16b69ad3897fedf 100644 (file)
--- a/src/host.h
+++ b/src/host.h
@@ -25,6 +25,7 @@
 #define __HOST_H__
 
 #include "decode.h"
+#include "util-storage.h"
 
 /** Spinlocks or Mutex for the flow buckets. */
 //#define HRLOCK_SPIN
@@ -68,6 +69,8 @@ typedef struct Host_ {
     void *tag;
     void *threshold;
     void *iprep;
+    /** storage api handle */
+    Storage *storage;
 
     /** hash pointers, protected by hash row mutex/spin */
     struct Host_ *hnext;