From ec4b50db168a7c75bc710afde527bc697f4b1112 Mon Sep 17 00:00:00 2001 From: Anoop Saldanha Date: Wed, 13 Apr 2011 11:17:38 +0530 Subject: [PATCH] disable mpm pattern's retest skipping in detection engine for uri, hcbd, hmd, hrhd, hhd, hmd, hcd --- src/detect-engine-hcbd.c | 4 ++-- src/detect-engine-hcd.c | 4 ++-- src/detect-engine-hhd.c | 4 ++-- src/detect-engine-hmd.c | 4 ++-- src/detect-engine-hrhd.c | 4 ++-- src/detect-engine-uri.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/detect-engine-hcbd.c b/src/detect-engine-hcbd.c index d587444..29638bf 100644 --- a/src/detect-engine-hcbd.c +++ b/src/detect-engine-hcbd.c @@ -96,8 +96,8 @@ static int DoInspectHttpClientBody(DetectEngineCtx *de_ctx, DetectContentData *cd = (DetectContentData *)sm->ctx; SCLogDebug("inspecting content %"PRIu32" payload_len %"PRIu32, cd->id, payload_len); - if (cd->flags & DETECT_CONTENT_HCBD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (cd->flags & DETECT_CONTENT_HCBD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG diff --git a/src/detect-engine-hcd.c b/src/detect-engine-hcd.c index 8c83566..a35b930 100644 --- a/src/detect-engine-hcd.c +++ b/src/detect-engine-hcd.c @@ -98,8 +98,8 @@ static int DoInspectHttpCookie(DetectEngineCtx *de_ctx, SCLogDebug("inspecting http cookie %"PRIu32" payload_len %"PRIu32, cd->id, payload_len); - if (cd->flags & DETECT_CONTENT_HCD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (cd->flags & DETECT_CONTENT_HCD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG diff --git a/src/detect-engine-hhd.c b/src/detect-engine-hhd.c index 9cea5ce..626e5f7 100644 --- a/src/detect-engine-hhd.c +++ b/src/detect-engine-hhd.c @@ -98,8 +98,8 @@ static int DoInspectHttpHeader(DetectEngineCtx *de_ctx, SCLogDebug("inspecting http headers %"PRIu32" payload_len %"PRIu32, cd->id, payload_len); - if (cd->flags & DETECT_CONTENT_HHD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (cd->flags & DETECT_CONTENT_HHD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG diff --git a/src/detect-engine-hmd.c b/src/detect-engine-hmd.c index 0e1d0d6..ed02d0c 100644 --- a/src/detect-engine-hmd.c +++ b/src/detect-engine-hmd.c @@ -98,8 +98,8 @@ static int DoInspectHttpMethod(DetectEngineCtx *de_ctx, SCLogDebug("inspecting http method %"PRIu32" payload_len %"PRIu32, cd->id, payload_len); - if (cd->flags & DETECT_CONTENT_HMD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (cd->flags & DETECT_CONTENT_HMD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG diff --git a/src/detect-engine-hrhd.c b/src/detect-engine-hrhd.c index d1d19b4..e052501 100644 --- a/src/detect-engine-hrhd.c +++ b/src/detect-engine-hrhd.c @@ -98,8 +98,8 @@ static int DoInspectHttpRawHeader(DetectEngineCtx *de_ctx, SCLogDebug("inspecting http headers %"PRIu32" payload_len %"PRIu32, cd->id, payload_len); - if (cd->flags & DETECT_CONTENT_HRHD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (cd->flags & DETECT_CONTENT_HRHD_MPM && !(cd->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG diff --git a/src/detect-engine-uri.c b/src/detect-engine-uri.c index 103c65e..44ee10d 100644 --- a/src/detect-engine-uri.c +++ b/src/detect-engine-uri.c @@ -101,8 +101,8 @@ static int DoInspectPacketUri(DetectEngineCtx *de_ctx, ud = (DetectContentData *)sm->ctx; SCLogDebug("inspecting content %"PRIu32" payload_len %"PRIu32, ud->id, payload_len); - if (ud->flags & DETECT_CONTENT_URI_MPM && !(ud->flags & DETECT_CONTENT_NEGATED)) - goto match; + //if (ud->flags & DETECT_CONTENT_URI_MPM && !(ud->flags & DETECT_CONTENT_NEGATED)) + // goto match; /* rule parsers should take care of this */ #ifdef DEBUG -- 1.7.1