Support for new MPM ac-bs added

src/Makefile.am

@@ -184,6 +184,7 @@ util-mpm-b2gc.c util-mpm-b2gc.h \
 util-mpm-b2gm.c util-mpm-b2gm.h \
 util-mpm-ac.c util-mpm-ac.h \
 util-mpm-ac-gfbs.c util-mpm-ac-gfbs.h \
+util-mpm-ac-bs.c util-mpm-ac-bs.h \
 util-cidr.c util-cidr.h \
 util-unittest.c util-unittest.h \
 util-unittest-helper.c util-unittest-helper.h \

src/util-mpm-ac-bs.h

@@ -0,0 +1,94 @@
+/* Copyright (C) 2007-2010 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 Anoop Saldanha <anoopsaldanha@gmail.com>
+ *
+ */
+
+#define SC_AC_BS_STATE_TYPE_U16 uint16_t
+#define SC_AC_BS_STATE_TYPE_U32 uint32_t
+
+typedef struct SCACBSPattern_ {
+    /* length of the pattern */
+    uint16_t len;
+    /* flags decribing the pattern */
+    uint8_t flags;
+    /* holds the original pattern that was added */
+    uint8_t *original_pat;
+    /* case sensitive */
+    uint8_t *cs;
+    /* case INsensitive */
+    uint8_t *ci;
+    /* pattern id */
+    uint32_t id;
+
+    struct SCACBSPattern_ *next;
+} SCACBSPattern;
+
+typedef struct SCACBSPatternList_ {
+    uint8_t *cs;
+    uint16_t patlen;
+    uint16_t case_state;
+} SCACBSPatternList;
+
+typedef struct SCACBSOutputTable_ {
+    /* list of pattern sids */
+    uint32_t *pids;
+    /* no of entries we have in pids */
+    uint32_t no_of_entries;
+} SCACBSOutputTable;
+
+typedef struct SCACBSCtx_ {
+    /* hash used during ctx initialization */
+    SCACBSPattern **init_hash;
+
+    /* pattern arrays.  We need this only during the goto table creation phase */
+    SCACBSPattern **parray;
+
+    /* no of states used by ac */
+    uint32_t state_count;
+    /* the all important memory hungry state_table */
+    SC_AC_BS_STATE_TYPE_U16 (*state_table_u16)[256];
+    /* the all important memory hungry state_table */
+    SC_AC_BS_STATE_TYPE_U32 (*state_table_u32)[256];
+    /* the modified goto_table */
+    uint8_t *state_table_mod;
+    uint8_t **state_table_mod_pointers;
+
+    /* goto_table, failure table and output table.  Needed to create state_table.
+     * Will be freed, once we have created the state_table */
+    int32_t (*goto_table)[256];
+    int32_t *failure_table;
+    SCACBSOutputTable *output_table;
+    SCACBSPatternList *pid_pat_list;
+
+    /* the size of each state */
+    uint16_t single_state_size;
+    uint16_t max_pat_id;
+} SCACBSCtx;
+
+typedef struct SCACBSThreadCtx_ {
+    /* the total calls we make to the search function */
+    uint32_t total_calls;
+    /* the total patterns that we ended up matching against */
+    uint64_t total_matches;
+} SCACBSThreadCtx;
+
+void MpmACBSRegister(void);

src/util-mpm.c

@@ -36,6 +36,7 @@
 #include "util-mpm-b2gm.h"
 #include "util-mpm-ac.h"
 #include "util-mpm-ac-gfbs.h"
+#include "util-mpm-ac-bs.h"
 #include "util-hashlist.h"
 
 #include "detect-engine.h"
@@ -406,6 +407,7 @@ void MpmTableSetup(void) {
     MpmB2gcRegister();
     MpmB2gmRegister();
     MpmACRegister();
+    MpmACBSRegister();
     MpmACGfbsRegister();
 }
 

src/util-mpm.h

@@ -77,6 +77,7 @@ enum {
     MPM_AC,
     /* aho-corasick-goto-failure state based */
     MPM_AC_GFBS,
+    MPM_AC_BS,
     /* table size */
     MPM_TABLE_SIZE,
 };