diff --git a/src/alert-prelude.c b/src/alert-prelude.c index 1a7b268149..b29e885fa9 100644 --- a/src/alert-prelude.c +++ b/src/alert-prelude.c @@ -62,22 +62,9 @@ /* Handle the case where no PRELUDE support is compiled in. */ -static TmEcode AlertPreludeThreadInit(ThreadVars *t, void *initdata, void **data) -{ - SCLogDebug("Can't init Prelude output thread - Prelude support was disabled during build."); - return TM_ECODE_FAILED; -} - -static TmEcode AlertPreludeThreadDeinit(ThreadVars *t, void *data) -{ - return TM_ECODE_FAILED; -} - void TmModuleAlertPreludeRegister (void) { - tmm_modules[TMM_ALERTPRELUDE].name = "AlertPrelude"; - tmm_modules[TMM_ALERTPRELUDE].ThreadInit = AlertPreludeThreadInit; - tmm_modules[TMM_ALERTPRELUDE].ThreadDeinit = AlertPreludeThreadDeinit; + SCLogDebug("Can't register Prelude output thread - Prelude support was disabled during build."); } #else /* implied we do have PRELUDE support */ @@ -929,15 +916,9 @@ err: void TmModuleAlertPreludeRegister (void) { - tmm_modules[TMM_ALERTPRELUDE].name = "AlertPrelude"; - tmm_modules[TMM_ALERTPRELUDE].ThreadInit = AlertPreludeThreadInit; - tmm_modules[TMM_ALERTPRELUDE].Func = NULL; - tmm_modules[TMM_ALERTPRELUDE].ThreadDeinit = AlertPreludeThreadDeinit; - tmm_modules[TMM_ALERTPRELUDE].cap_flags = 0; - tmm_modules[TMM_ALERTPRELUDE].flags = TM_FLAG_LOGAPI_TM; - - OutputRegisterPacketModule("AlertPrelude", "alert-prelude", AlertPreludeInitCtx, - AlertPreludeLogger, AlertPreludeCondition); + OutputRegisterPacketModule("AlertPrelude", "alert-prelude", + AlertPreludeInitCtx, AlertPreludeLogger, AlertPreludeCondition, + AlertPreludeThreadInit, AlertPreludeThreadDeinit, NULL); } #endif /* PRELUDE */ diff --git a/src/tm-modules.c b/src/tm-modules.c index 9e3a83604b..d4d167158c 100644 --- a/src/tm-modules.c +++ b/src/tm-modules.c @@ -212,7 +212,6 @@ const char * TmModuleTmmIdToString(TmmId id) CASE_CODE (TMM_RECEIVEPFRING); CASE_CODE (TMM_DECODEPFRING); CASE_CODE (TMM_ALERTUNIFIED2ALERT); - CASE_CODE (TMM_ALERTPRELUDE); CASE_CODE (TMM_ALERTDEBUGLOG); CASE_CODE (TMM_ALERTSYSLOG); CASE_CODE (TMM_LOGDROPLOG); diff --git a/src/tm-threads-common.h b/src/tm-threads-common.h index c844f2c17e..7288b92ebd 100644 --- a/src/tm-threads-common.h +++ b/src/tm-threads-common.h @@ -42,7 +42,6 @@ typedef enum { TMM_RECEIVEPFRING, TMM_DECODEPFRING, TMM_ALERTUNIFIED2ALERT, - TMM_ALERTPRELUDE, TMM_ALERTDEBUGLOG, TMM_ALERTSYSLOG, TMM_LOGDROPLOG,