mpm: remove empty app_mpms table

pull/2310/head
Victor Julien 9 years ago
parent e68b2214e5
commit 6dd4dff7b2

@ -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);

@ -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

@ -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) {

Loading…
Cancel
Save