aiden
/
suricata
mirror of https://github.com/OISF/suricata
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

comment out hrhd flags that we were using previously. Also remove the de_mpm_ based flags inside detect.h used by uri|hcbd|hhd|hrhd mpms. indentation fix as well

Browse Source
remotes/origin/master-1.1.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent e50503e820
commit 25588b6910
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File

12
src/detect-engine-mpm.c
Unescape Escape View File

@ -633,7 +633,7 @@ static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
DetectContentData *hhd = NULL;
DetectContentData *hrhd = NULL;
switch (mpm_sm->type) {
case DETECT_CONTENT:
case DETECT_CONTENT:
{
cd = (DetectContentData *)mpm_sm->ctx;
if (cd->flags & DETECT_CONTENT_FAST_PATTERN_CHOP) {
@ -757,7 +757,8 @@ static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
break;
} /* case DETECT_CONTENT */
case DETECT_URICONTENT:
case DETECT_URICONTENT:
{
ud = (DetectContentData *)mpm_sm->ctx;
if (ud->flags & DETECT_CONTENT_FAST_PATTERN_CHOP) {
@ -812,7 +813,7 @@ static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
break;
} /* case DETECT_URICONTENT */
case DETECT_AL_HTTP_CLIENT_BODY:
case DETECT_AL_HTTP_CLIENT_BODY:
{
hcbd = (DetectContentData *)mpm_sm->ctx;
if (hcbd->flags & DETECT_CONTENT_FAST_PATTERN_CHOP) {
@ -867,7 +868,7 @@ static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
break;
} /* case DETECT_AL_HTTP_CLIENT_BODY */
case DETECT_AL_HTTP_HEADER:
case DETECT_AL_HTTP_HEADER:
{
hhd = (DetectContentData *)mpm_sm->ctx;
if (hhd->flags & DETECT_CONTENT_FAST_PATTERN_CHOP) {
@ -922,7 +923,7 @@ static void PopulateMpmAddPatternToMpm(DetectEngineCtx *de_ctx,
break;
} /* case DETECT_AL_HTTP_HEADER */
case DETECT_AL_HTTP_RAW_HEADER:
case DETECT_AL_HTTP_RAW_HEADER:
{
hrhd = (DetectContentData *)mpm_sm->ctx;
if (hrhd->flags & DETECT_CONTENT_FAST_PATTERN_CHOP) {
@ -1189,7 +1190,6 @@ static int PatternMatchPreparePopulateMpm(DetectEngineCtx *de_ctx,
}
}
SigMatch *mpm_sm = NULL;
SigMatch *sm = NULL;
int list_id = 0;

6
src/detect.c
Unescape Escape View File

@ -1008,8 +1008,8 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
//det_ctx->de_have_hhd = TRUE;
//det_ctx->de_mpm_scanned_hhd = FALSE;
det_ctx->de_have_hrhd = TRUE;
det_ctx->de_mpm_scanned_hrhd = FALSE;
//det_ctx->de_have_hrhd = TRUE;
//det_ctx->de_mpm_scanned_hrhd = FALSE;
SCEnter();
@ -1126,7 +1126,7 @@ int SigMatchSignatures(ThreadVars *th_v, DetectEngineCtx *de_ctx, DetectEngineTh
/* stateful app layer detection */
if (p->flags & PKT_HAS_FLOW && alstate != NULL) {
det_ctx->de_mpm_scanned_uri = FALSE;
//det_ctx->de_mpm_scanned_uri = FALSE;
/* initialize to 0 (DE_STATE_MATCH_NOSTATE) */
memset(det_ctx->de_state_sig_array, 0x00, det_ctx->de_state_sig_array_len);

16
src/detect.h
Unescape Escape View File

@ -683,20 +683,20 @@ typedef struct DetectionEngineThreadCtx_ {
uint32_t pcre_match_start_offset;
/* http_uri stuff for uricontent */
char de_have_httpuri;
char de_mpm_scanned_uri;
//char de_have_httpuri;
//char de_mpm_scanned_uri;
/* detectione engine context for hcbd mpm */
char de_have_hcbd;
char de_mpm_scanned_hcbd;
//char de_have_hcbd;
//char de_mpm_scanned_hcbd;
/* detectione engine context for hhd mpm */
char de_have_hhd;
char de_mpm_scanned_hhd;
//char de_have_hhd;
//char de_mpm_scanned_hhd;
/* detectione engine context for hrhd mpm */
char de_have_hrhd;
char de_mpm_scanned_hrhd;
//char de_have_hrhd;
//char de_mpm_scanned_hrhd;
uint8_t **hcbd_buffers;
uint32_t *hcbd_buffers_len;

Write Preview
Loading…
Cancel
Save