suricata checkin based on commit id a4bce14770beee46a537eda3c3f6e8e8565d5d0a

Change-Id: I9a214fa0ee95e58fc640e50bd604dac7f42db48f

1 files changed, 132 insertions, 0 deletions

diff --git a/framework/src/suricata/src/tm-threads-common.h b/framework/src/suricata/src/tm-threads-common.h
new file mode 100644
index 00000000..f6629eaa
--- /dev/null
+++ b/framework/src/suricata/src/tm-threads-common.h
@@ -0,0 +1,132 @@
+/* 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>
+ * \author Anoop Saldanha <anoopsaldanha@gmail.com>
+ */
+
+#ifndef __TM_THREADS_COMMON_H__
+#define __TM_THREADS_COMMON_H__
+
+/** \brief Thread Model Module id's.
+ *
+ *  \note anything added here should also be added to TmModuleTmmIdToString
+ *        in tm-modules.c
+ */
+typedef enum {
+    TMM_DECODENFQ,
+    TMM_VERDICTNFQ,
+    TMM_RECEIVENFQ,
+    TMM_RECEIVEPCAP,
+    TMM_RECEIVEPCAPFILE,
+    TMM_DECODEPCAP,
+    TMM_DECODEPCAPFILE,
+    TMM_RECEIVEPFRING,
+    TMM_DECODEPFRING,
+    TMM_DETECT,
+    TMM_ALERTFASTLOG,
+    TMM_ALERTFASTLOG4,
+    TMM_ALERTFASTLOG6,
+    TMM_ALERTUNIFIED2ALERT,
+    TMM_ALERTPRELUDE,
+    TMM_ALERTDEBUGLOG,
+    TMM_ALERTSYSLOG,
+    TMM_LOGDROPLOG,
+    TMM_ALERTSYSLOG4,
+    TMM_ALERTSYSLOG6,
+    TMM_RESPONDREJECT,
+    TMM_LOGDNSLOG,
+    TMM_LOGHTTPLOG,
+    TMM_LOGHTTPLOG4,
+    TMM_LOGHTTPLOG6,
+    TMM_LOGTLSLOG,
+    TMM_LOGTLSLOG4,
+    TMM_LOGTLSLOG6,
+    TMM_LOGTCPDATALOG,
+    TMM_OUTPUTJSON,
+    TMM_PCAPLOG,
+    TMM_FILELOG,
+    TMM_FILESTORE,
+    TMM_STREAMTCP,
+    TMM_DECODEIPFW,
+    TMM_VERDICTIPFW,
+    TMM_RECEIVEIPFW,
+    TMM_RECEIVEERFFILE,
+    TMM_DECODEERFFILE,
+    TMM_RECEIVEERFDAG,
+    TMM_DECODEERFDAG,
+    TMM_RECEIVEAFP,
+    TMM_DECODEAFP,
+    TMM_RECEIVENETMAP,
+    TMM_DECODENETMAP,
+    TMM_ALERTPCAPINFO,
+    TMM_RECEIVEMPIPE,
+    TMM_DECODEMPIPE,
+    TMM_RECEIVENAPATECH,
+    TMM_DECODENAPATECH,
+    TMM_PACKETLOGGER,
+    TMM_TXLOGGER,
+    TMM_STATSLOGGER,
+    TMM_FILELOGGER,
+    TMM_FILEDATALOGGER,
+    TMM_STREAMINGLOGGER,
+    TMM_JSONALERTLOG,
+    TMM_JSONDROPLOG,
+    TMM_JSONHTTPLOG,
+    TMM_JSONDNSLOG,
+    TMM_JSONSMTPLOG,
+    TMM_JSONSSHLOG,
+    TMM_JSONSTATSLOG,
+    TMM_JSONTLSLOG,
+    TMM_JSONFILELOG,
+    TMM_RECEIVENFLOG,
+    TMM_DECODENFLOG,
+    TMM_JSONFLOWLOG,
+    TMM_JSONNETFLOWLOG,
+    TMM_LOGSTATSLOG,
+
+    TMM_FLOWMANAGER,
+    TMM_FLOWRECYCLER,
+    TMM_DETECTLOADER,
+
+    TMM_UNIXMANAGER,
+
+    TMM_LUALOG,
+    TMM_TLSSTORE,
+    TMM_SIZE,
+} TmmId;
+
+/*Error codes for the thread modules*/
+typedef enum {
+    TM_ECODE_OK = 0,    /**< Thread module exits OK*/
+    TM_ECODE_FAILED,    /**< Thread module exits due to failure*/
+    TM_ECODE_DONE,    /**< Thread module task is finished*/
+} TmEcode;
+
+/* ThreadVars type */
+enum {
+    TVT_PPT,
+    TVT_MGMT,
+    TVT_CMD,
+    TVT_MAX,
+};
+
+#endif /* __TM_THREADS_COMMON_H__ */
+