diff --git a/src/detect-engine-mpm.c b/src/detect-engine-mpm.c index c3ea035f06..8f94aa4421 100644 --- a/src/detect-engine-mpm.c +++ b/src/detect-engine-mpm.c @@ -84,22 +84,6 @@ const char *builtin_mpms[] = { NULL }; -typedef struct AppLayerMpms_ { - const char *name; - int unused; - int direction; /**< SIG_FLAG_TOSERVER or SIG_FLAG_TOCLIENT */ - int sm_list; - - int (*PrefilterRegister)(SigGroupHead *sgh, MpmCtx *mpm_ctx); - - int id; - -} AppLayerMpms; - -AppLayerMpms app_mpms[] = { - { NULL, 0, 0, 0, NULL, 0, } -}; - /* Registery for mpm keywords * * Keywords are registered at engine start up @@ -132,18 +116,6 @@ void DetectMpmAppLayerRegister(const char *name, int direction, int sm_list, g_app_mpms_list_cnt++; } -/* temporary table for turning the table app_mpms into the registery - * TODO to be removed */ -void RegisterAppMpmTable(void) -{ - AppLayerMpms *am = app_mpms; - while (am->name != NULL) { - DetectMpmAppLayerRegister(am->name, am->direction, - am->sm_list, am->PrefilterRegister); - am++; - } -} - void DetectMpmInitializeAppMpms(DetectEngineCtx *de_ctx) { BUG_ON(g_app_mpms_list_cnt == 0); diff --git a/src/detect-engine-mpm.h b/src/detect-engine-mpm.h index 6d4063243b..3d12506fd1 100644 --- a/src/detect-engine-mpm.h +++ b/src/detect-engine-mpm.h @@ -80,8 +80,6 @@ MpmStore *MpmStorePrepareBuffer(DetectEngineCtx *de_ctx, SigGroupHead *sgh, enum */ int DetectSetFastPatternAndItsId(DetectEngineCtx *de_ctx); -void RegisterAppMpmTable(void); - /** \brief register an app layer keyword for mpm * \param name keyword name * \param direction SIG_FLAG_TOSERVER or SIG_FLAG_TOCLIENT diff --git a/src/suricata.c b/src/suricata.c index 27c4cc5065..cfdb9dcc24 100644 --- a/src/suricata.c +++ b/src/suricata.c @@ -2400,9 +2400,6 @@ int main(int argc, char **argv) * are specified, IPS mode will overwrite this */ EngineModeSetIDS(); - /* TODO temporary */ - RegisterAppMpmTable(); - #ifdef OS_WIN32 /* service initialization */ if (WindowsInit(argc, argv) != 0) {