From 73158fea333e0ecc6cb14b98b521217e4d95f822 Mon Sep 17 00:00:00 2001 From: Victor Julien Date: Wed, 10 Apr 2013 10:06:30 +0200 Subject: [PATCH] Fix PmqSetup calls in Liveswap thread init. Func was out of sync with normal thread init. --- src/detect-engine.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/detect-engine.c b/src/detect-engine.c index 11a06d969c..02aade3e29 100644 --- a/src/detect-engine.c +++ b/src/detect-engine.c @@ -1074,12 +1074,9 @@ TmEcode DetectEngineThreadCtxInit(ThreadVars *tv, void *initdata, void **data) { PatternMatchThreadPrepare(&det_ctx->mtcs, de_ctx->mpm_matcher, DetectContentMaxId(de_ctx)); PatternMatchThreadPrepare(&det_ctx->mtcu, de_ctx->mpm_matcher, DetectUricontentMaxId(de_ctx)); - //PmqSetup(&det_ctx->pmq, DetectEngineGetMaxSigId(de_ctx), DetectContentMaxId(de_ctx)); PmqSetup(&det_ctx->pmq, 0, de_ctx->max_fp_id); - //PmqSetup(&det_ctx->pmq, 0, DetectContentMaxId(de_ctx)); int i; for (i = 0; i < 256; i++) { - //PmqSetup(&det_ctx->smsg_pmq[i], 0, DetectContentMaxId(de_ctx)); PmqSetup(&det_ctx->smsg_pmq[i], 0, de_ctx->max_fp_id); } @@ -1163,11 +1160,10 @@ static TmEcode DetectEngineThreadCtxInitForLiveRuleSwap(ThreadVars *tv, void *in PatternMatchThreadPrepare(&det_ctx->mtcs, de_ctx->mpm_matcher, DetectContentMaxId(de_ctx)); PatternMatchThreadPrepare(&det_ctx->mtcu, de_ctx->mpm_matcher, DetectUricontentMaxId(de_ctx)); - //PmqSetup(&det_ctx->pmq, DetectEngineGetMaxSigId(de_ctx), DetectContentMaxId(de_ctx)); - PmqSetup(&det_ctx->pmq, 0, DetectContentMaxId(de_ctx)); + PmqSetup(&det_ctx->pmq, 0, de_ctx->max_fp_id); int i; for (i = 0; i < 256; i++) { - PmqSetup(&det_ctx->smsg_pmq[i], 0, DetectContentMaxId(de_ctx)); + PmqSetup(&det_ctx->smsg_pmq[i], 0, de_ctx->max_fp_id); } /* IP-ONLY */