From: Victor Julien <victor@inliniac.net>
Date: Mon, 17 Oct 2016 22:42:26 +0000 (+0200)
Subject: detect: inspect engine setup cleanup
X-Git-Tag: suricata-4.0.0-beta1~399
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58e1180efea18adb28e5abd64877cfc3221c6268;p=thirdparty%2Fsuricata.git

detect: inspect engine setup cleanup
---

diff --git a/src/detect-engine.c b/src/detect-engine.c
index 5fa3d4fbe1..4c14a0c82a 100644
--- a/src/detect-engine.c
+++ b/src/detect-engine.c
@@ -179,50 +179,9 @@ int DetectEngineAppInspectionEngine2Signature(Signature *s)
         new_engine->alproto = t->alproto;
         new_engine->dir = t->dir;
         new_engine->sm_list = t->sm_list;
+        new_engine->smd = ptrs[new_engine->sm_list];
         new_engine->Callback = t->Callback;
 
-        switch (new_engine->sm_list) {
-            case DETECT_SM_LIST_HMDMATCH:
-            case DETECT_SM_LIST_UMATCH:
-            case DETECT_SM_LIST_HRUDMATCH:
-            case DETECT_SM_LIST_HTTP_REQLINEMATCH:
-            case DETECT_SM_LIST_HTTP_RESLINEMATCH:
-            case DETECT_SM_LIST_HCBDMATCH:
-            case DETECT_SM_LIST_FILEDATA:
-            case DETECT_SM_LIST_HHDMATCH:
-            case DETECT_SM_LIST_HRHDMATCH:
-            case DETECT_SM_LIST_HSMDMATCH:
-            case DETECT_SM_LIST_HSCDMATCH:
-            case DETECT_SM_LIST_HHHDMATCH:
-            case DETECT_SM_LIST_HRHHDMATCH:
-            case DETECT_SM_LIST_HCDMATCH:
-            case DETECT_SM_LIST_HUADMATCH:
-
-            case DETECT_SM_LIST_FILEMATCH:
-
-            case DETECT_SM_LIST_DNSQUERYNAME_MATCH:
-            case DETECT_SM_LIST_DNSREQUEST_MATCH:
-            case DETECT_SM_LIST_DNSRESPONSE_MATCH:
-
-            case DETECT_SM_LIST_TLSSNI_MATCH:
-            case DETECT_SM_LIST_TLSISSUER_MATCH:
-            case DETECT_SM_LIST_TLSSUBJECT_MATCH:
-            case DETECT_SM_LIST_TLSVALIDITY_MATCH:
-
-            case DETECT_SM_LIST_APP_EVENT:
-
-            case DETECT_SM_LIST_MODBUS_MATCH:
-            case DETECT_SM_LIST_CIP_MATCH:
-            case DETECT_SM_LIST_ENIP_MATCH:
-
-            case DETECT_SM_LIST_TEMPLATE_BUFFER_MATCH:
-
-                new_engine->smd = ptrs[new_engine->sm_list];
-                break;
-            default:
-                break;
-        }
-
         if (s->app_inspect == NULL) {
             s->app_inspect = new_engine;
             new_engine->id = DE_STATE_FLAG_BASE; /* id is used as flag in stateful detect */