From: Victor Julien <victor@inliniac.net>
Date: Tue, 13 Oct 2015 06:44:45 +0000 (+0200)
Subject: detect mpm: remove unused mpm flags
X-Git-Tag: suricata-3.1RC1~340
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c94077892cea1b1153c8a814c126b13eb81c08c;p=thirdparty%2Fsuricata.git

detect mpm: remove unused mpm flags
---

diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c
index 620cda3cce..65baebf9e4 100644
--- a/src/detect-engine-mpm.c
+++ b/src/detect-engine-mpm.c
@@ -1386,20 +1386,15 @@ void MpmStoreSetup(const DetectEngineCtx *de_ctx, MpmStore *ms)
                 /* tell matcher we are inspecting packet */
                 /* TODO remove! */
                 if (!(ms->buffer == MPMB_TCP_STREAM_TC || ms->buffer == MPMB_TCP_STREAM_TS)) {
-                    s->flags |= SIG_FLAG_MPM_PACKET;
                     s->mpm_pattern_id_div_8 = cd->id / 8;
                     s->mpm_pattern_id_mod_8 = 1 << (cd->id % 8);
                 } else {
-                    /* tell matcher we are inspecting stream */
-                    s->flags |= SIG_FLAG_MPM_STREAM;
                     s->mpm_pattern_id_div_8 = cd->id / 8;
                     s->mpm_pattern_id_mod_8 = 1 << (cd->id % 8);
                 }
             } else {
-                /* tell matcher we are inspecting app-layer */
                 s->mpm_pattern_id_div_8 = cd->id / 8;
                 s->mpm_pattern_id_mod_8 = 1 << (cd->id % 8);
-                s->flags |= SIG_FLAG_MPM_APPLAYER;
             }
         }
     }
diff --git a/src/detect.h b/src/detect.h
index d701a0d529..faa752f8a1 100644
--- a/src/detect.h
+++ b/src/detect.h
@@ -258,9 +258,6 @@ typedef struct DetectPort_ {
 #define SIG_FLAG_REQUIRE_STREAM         (1<<10) /**< signature is requiring stream match */
 
 #define SIG_FLAG_MPM_NEG                (1<<11)
-#define SIG_FLAG_MPM_PACKET             (1<<12)
-#define SIG_FLAG_MPM_STREAM             (1<<13)
-#define SIG_FLAG_MPM_APPLAYER           (1<<14)
 
 #define SIG_FLAG_REQUIRE_FLOWVAR        (1<<17) /**< signature can only match if a flowbit, flowvar or flowint is available. */