diff --git a/src/detect-engine-hsmd.c b/src/detect-engine-hsmd.c index cacee62fef..46d3e4fe00 100644 --- a/src/detect-engine-hsmd.c +++ b/src/detect-engine-hsmd.c @@ -65,14 +65,12 @@ * \retval ret Number of matches. */ static inline uint32_t HttpStatMsgPatternSearch(DetectEngineThreadCtx *det_ctx, - const uint8_t *stat_msg, const uint32_t stat_msg_len, - const uint8_t flags) + const uint8_t *stat_msg, const uint32_t stat_msg_len) { SCEnter(); uint32_t ret = 0; - DEBUG_VALIDATE_BUG_ON(!(flags & STREAM_TOCLIENT)); DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_hsmd_ctx_tc == NULL); if (stat_msg_len >= det_ctx->sgh->mpm_hsmd_ctx_tc->minlen) { @@ -89,9 +87,7 @@ static inline uint32_t HttpStatMsgPatternSearch(DetectEngineThreadCtx *det_ctx, * * \retval cnt Number of matches reported by the mpm algo. */ -int DetectEngineRunHttpStatMsgMpm(DetectEngineThreadCtx *det_ctx, Flow *f, - HtpState *htp_state, uint8_t flags, - void *txv, uint64_t idx) +int DetectEngineRunHttpStatMsgMpm(DetectEngineThreadCtx *det_ctx, void *txv) { SCEnter(); @@ -102,7 +98,7 @@ int DetectEngineRunHttpStatMsgMpm(DetectEngineThreadCtx *det_ctx, Flow *f, cnt = HttpStatMsgPatternSearch(det_ctx, (const uint8_t *)bstr_ptr(tx->response_message), - bstr_len(tx->response_message), flags); + bstr_len(tx->response_message)); end: SCReturnInt(cnt); } diff --git a/src/detect-engine-hsmd.h b/src/detect-engine-hsmd.h index 01fc3612b7..9faa2064f8 100644 --- a/src/detect-engine-hsmd.h +++ b/src/detect-engine-hsmd.h @@ -25,9 +25,8 @@ #include "app-layer-htp.h" -int DetectEngineRunHttpStatMsgMpm(DetectEngineThreadCtx *det_ctx, Flow *f, - HtpState *htp_state, uint8_t flags, - void *tx, uint64_t idx); +int DetectEngineRunHttpStatMsgMpm(DetectEngineThreadCtx *det_ctx, void *txv); + int DetectEngineInspectHttpStatMsg(ThreadVars *tv, DetectEngineCtx *de_ctx, DetectEngineThreadCtx *det_ctx, diff --git a/src/detect.c b/src/detect.c index 020811e401..1ddde948db 100644 --- a/src/detect.c +++ b/src/detect.c @@ -968,7 +968,7 @@ static inline void DetectMpmPrefilter(DetectEngineCtx *de_ctx, if (tx_progress > HTP_RESPONSE_LINE) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HSMD) { PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_HSMD); - DetectEngineRunHttpStatMsgMpm(det_ctx, p->flow, alstate, flags, tx, idx); + DetectEngineRunHttpStatMsgMpm(det_ctx, tx); PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_HSMD); } if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HSCD) {