From e2b006f523469cfede177f392575aaefb7e22ef2 Mon Sep 17 00:00:00 2001
From: Victor Julien <victor@inliniac.net>
Date: Tue, 22 Jan 2013 18:01:58 +0100
Subject: [PATCH] host: use storage api

---
 src/Makefile.am    |  1 +
 src/host-storage.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++
 src/host-storage.h | 33 ++++++++++++++++++++++++++++
 src/host.h         |  3 +++
 4 files changed, 91 insertions(+)
 create mode 100644 src/host-storage.c
 create mode 100644 src/host-storage.h

diff --git a/src/Makefile.am b/src/Makefile.am
index c672b05297..b28643401d 100644
--- 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
index 0000000000..3bcbfbe556
--- /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
index 0000000000..4905744d71
--- /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 49b3b7280d..2935776913 100644
--- 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;