mpm host: remove unused function args

pull/2310/head
Victor Julien 10 years ago
parent b40ecb7356
commit 1380853ee8

@ -71,14 +71,12 @@
* \retval ret Number of matches. * \retval ret Number of matches.
*/ */
static inline uint32_t HttpHHPatternSearch(DetectEngineThreadCtx *det_ctx, static inline uint32_t HttpHHPatternSearch(DetectEngineThreadCtx *det_ctx,
const uint8_t *hh, const uint32_t hh_len, const uint8_t *hh, const uint32_t hh_len)
const uint8_t flags)
{ {
SCEnter(); SCEnter();
uint32_t ret = 0; uint32_t ret = 0;
DEBUG_VALIDATE_BUG_ON(flags & STREAM_TOCLIENT);
DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_hhhd_ctx_ts == NULL); DEBUG_VALIDATE_BUG_ON(det_ctx->sgh->mpm_hhhd_ctx_ts == NULL);
if (hh_len >= det_ctx->sgh->mpm_hhhd_ctx_ts->minlen) { if (hh_len >= det_ctx->sgh->mpm_hhhd_ctx_ts->minlen) {
@ -90,9 +88,7 @@ static inline uint32_t HttpHHPatternSearch(DetectEngineThreadCtx *det_ctx,
SCReturnUInt(ret); SCReturnUInt(ret);
} }
int DetectEngineRunHttpHHMpm(DetectEngineThreadCtx *det_ctx, Flow *f, int DetectEngineRunHttpHHMpm(DetectEngineThreadCtx *det_ctx, void *txv)
HtpState *htp_state, uint8_t flags,
void *txv, uint64_t idx)
{ {
uint32_t cnt = 0; uint32_t cnt = 0;
htp_tx_t *tx = (htp_tx_t *)txv; htp_tx_t *tx = (htp_tx_t *)txv;
@ -103,7 +99,7 @@ int DetectEngineRunHttpHHMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
goto end; goto end;
const uint32_t hname_len = bstr_len(tx->request_hostname); const uint32_t hname_len = bstr_len(tx->request_hostname);
cnt = HttpHHPatternSearch(det_ctx, hname, hname_len, flags); cnt = HttpHHPatternSearch(det_ctx, hname, hname_len);
end: end:
return cnt; return cnt;

@ -31,9 +31,9 @@ int DetectEngineInspectHttpHH(ThreadVars *tv,
Signature *s, Flow *f, uint8_t flags, Signature *s, Flow *f, uint8_t flags,
void *alstate, void *alstate,
void *tx, uint64_t tx_id); void *tx, uint64_t tx_id);
int DetectEngineRunHttpHHMpm(DetectEngineThreadCtx *det_ctx, Flow *f,
HtpState *htp_state, uint8_t flags, int DetectEngineRunHttpHHMpm(DetectEngineThreadCtx *det_ctx, void *txv);
void *tx, uint64_t idx);
void DetectEngineHttpHHRegisterTests(void); void DetectEngineHttpHHRegisterTests(void);
#endif /* __DETECT_ENGINE_HHHD_H__ */ #endif /* __DETECT_ENGINE_HHHD_H__ */

@ -922,7 +922,7 @@ static inline void DetectMpmPrefilter(DetectEngineCtx *de_ctx,
if (tx_progress >= HTP_REQUEST_HEADERS) { if (tx_progress >= HTP_REQUEST_HEADERS) {
if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HHHD) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HHHD) {
PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_HHHD); PACKET_PROFILING_DETECT_START(p, PROF_DETECT_MPM_HHHD);
DetectEngineRunHttpHHMpm(det_ctx, p->flow, alstate, flags, tx, idx); DetectEngineRunHttpHHMpm(det_ctx, tx);
PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_HHHD); PACKET_PROFILING_DETECT_END(p, PROF_DETECT_MPM_HHHD);
} }
if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HRHHD) { if (det_ctx->sgh->flags & SIG_GROUP_HEAD_MPM_HRHHD) {

Loading…
Cancel
Save