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

Remove case_state usage

Browse Source 
The case_state in MPMs was just to track when a pid could have no-case and
case-sensitive matches for the same PID. Now that can't happen after fixing
bug 1110, so remove the code and storage for case_state.
pull/852/merge
Ken Steele 12 years ago committed by Victor Julien
parent c41041a9c7
commit 6b1517c0b8
8 changed files with 34 additions and 119 deletions
Show Stats Download Patch File Download Diff File

43
src/util-mpm-ac-bs.c
Unescape Escape View File

@ -1202,32 +1202,15 @@ int SCACBSPreparePatterns(MpmCtx *mpm_ctx)
memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACBSPatternList)); memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACBSPatternList));
for (i = 0; i < mpm_ctx->pattern_cnt; i++) { for (i = 0; i < mpm_ctx->pattern_cnt; i++) {
if (ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE) { if (!(ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE)) {
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0) ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1; if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 1) SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1; exit(EXIT_FAILURE);
else }
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3; memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
} else { ctx->parray[i]->original_pat, ctx->parray[i]->len);
//if (memcmp(ctx->parray[i]->original_pat, ctx->parray[i]->ci, ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
// ctx->parray[i]->len) != 0) {
ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
exit(EXIT_FAILURE);
}
memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
ctx->parray[i]->original_pat, ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 2)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
//}
} }
} }
@ -1495,9 +1478,7 @@ uint32_t SCACBSSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
; ;
@ -1578,9 +1559,7 @@ uint32_t SCACBSSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
; ;

3
src/util-mpm-ac-bs.h
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2010 Open Information Security Foundation /* Copyright (C) 2007-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -45,7 +45,6 @@ typedef struct SCACBSPattern_ {
typedef struct SCACBSPatternList_ { typedef struct SCACBSPatternList_ {
uint8_t *cs; uint8_t *cs;
uint16_t patlen; uint16_t patlen;
uint16_t case_state;
} SCACBSPatternList; } SCACBSPatternList;
typedef struct SCACBSOutputTable_ { typedef struct SCACBSOutputTable_ {

23
src/util-mpm-ac-gfbs.c
Unescape Escape View File

@ -1073,14 +1073,7 @@ int SCACGfbsPreparePatterns(MpmCtx *mpm_ctx)
memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACGfbsPatternList)); memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACGfbsPatternList));
for (i = 0; i < mpm_ctx->pattern_cnt; i++) { for (i = 0; i < mpm_ctx->pattern_cnt; i++) {
if (ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE) { if (!(ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE)) {
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 1)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
} else {
ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len); ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) { if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory"); SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
@ -1089,13 +1082,6 @@ int SCACGfbsPreparePatterns(MpmCtx *mpm_ctx)
memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs, memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
ctx->parray[i]->original_pat, ctx->parray[i]->len); ctx->parray[i]->original_pat, ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len; ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 2)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
} }
} }
@ -1404,9 +1390,7 @@ uint32_t SCACGfbsSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
@ -1531,9 +1515,6 @@ uint32_t SCACGfbsSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) {
continue;
}
continue; continue;
} }

3
src/util-mpm-ac-gfbs.h
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2010 Open Information Security Foundation /* Copyright (C) 2007-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -45,7 +45,6 @@ typedef struct SCACGfbsPattern_ {
typedef struct SCACGfbsPatternList_ { typedef struct SCACGfbsPatternList_ {
uint8_t *cs; uint8_t *cs;
uint16_t patlen; uint16_t patlen;
uint16_t case_state;
} SCACGfbsPatternList; } SCACGfbsPatternList;
typedef struct SCACGfbsOutputTable_ { typedef struct SCACGfbsOutputTable_ {

26
src/util-mpm-ac-tile.c
Unescape Escape View File

@ -1202,14 +1202,7 @@ int SCACTilePreparePatterns(MpmCtx *mpm_ctx)
memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACTilePatternList)); memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACTilePatternList));
for (i = 0; i < mpm_ctx->pattern_cnt; i++) { for (i = 0; i < mpm_ctx->pattern_cnt; i++) {
if (ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE) { if (!(ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE)) {
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 1)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
} else {
ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len); ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) { if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory"); SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
@ -1218,13 +1211,6 @@ int SCACTilePreparePatterns(MpmCtx *mpm_ctx)
memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs, memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
ctx->parray[i]->original_pat, ctx->parray[i]->len); ctx->parray[i]->original_pat, ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len; ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 2)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
} }
} }
@ -1436,9 +1422,7 @@ int CheckMatch(SCACTileSearchCtx *ctx, PatternMatcherQueue *pmq,
uint16_t patlen = pid_pat_list[lower_pid].patlen; uint16_t patlen = pid_pat_list[lower_pid].patlen;
if (SCMemcmp(pid_pat_list[lower_pid].cs, buf_offset - patlen, patlen) != 0) { if (SCMemcmp(pid_pat_list[lower_pid].cs, buf_offset - patlen, patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[lower_pid].case_state != 3) { continue;
continue;
}
} }
} }
if (bitarray[(lower_pid) / 8] & (1 << ((lower_pid) % 8))) { if (bitarray[(lower_pid) / 8] & (1 << ((lower_pid) % 8))) {
@ -1506,10 +1490,8 @@ uint32_t SCACTileSearchLarge(SCACTileSearchCtx *ctx, MpmThreadCtx *mpm_thread_ct
if (SCMemcmp(pid_pat_list[pids[k] & 0x0000FFFF].cs, if (SCMemcmp(pid_pat_list[pids[k] & 0x0000FFFF].cs,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] &
(1 << ((pids[k] & 0x0000FFFF) % 8))) { (1 << ((pids[k] & 0x0000FFFF) % 8))) {

3
src/util-mpm-ac-tile.h
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2013 Open Information Security Foundation /* Copyright (C) 2013-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -46,7 +46,6 @@ typedef struct SCACTilePattern_ {
typedef struct SCACTilePatternList_ { typedef struct SCACTilePatternList_ {
uint8_t *cs; uint8_t *cs;
uint16_t patlen; uint16_t patlen;
uint16_t case_state;
} SCACTilePatternList; } SCACTilePatternList;
typedef struct SCACTileOutputTable_ { typedef struct SCACTileOutputTable_ {

49
src/util-mpm-ac.c
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2010 Open Information Security Foundation /* Copyright (C) 2007-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -1006,32 +1006,15 @@ int SCACPreparePatterns(MpmCtx *mpm_ctx)
memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACPatternList)); memset(ctx->pid_pat_list, 0, (ctx->max_pat_id + 1) * sizeof(SCACPatternList));
for (i = 0; i < mpm_ctx->pattern_cnt; i++) { for (i = 0; i < mpm_ctx->pattern_cnt; i++) {
if (ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE) { if (!(ctx->parray[i]->flags & MPM_PATTERN_FLAG_NOCASE)) {
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0) ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1; if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 1) SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 1; exit(EXIT_FAILURE);
else }
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3; memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
} else { ctx->parray[i]->original_pat, ctx->parray[i]->len);
//if (memcmp(ctx->parray[i]->original_pat, ctx->parray[i]->ci, ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
// ctx->parray[i]->len) != 0) {
ctx->pid_pat_list[ctx->parray[i]->id].cs = SCMalloc(ctx->parray[i]->len);
if (ctx->pid_pat_list[ctx->parray[i]->id].cs == NULL) {
SCLogError(SC_ERR_MEM_ALLOC, "Error allocating memory");
exit(EXIT_FAILURE);
}
memcpy(ctx->pid_pat_list[ctx->parray[i]->id].cs,
ctx->parray[i]->original_pat, ctx->parray[i]->len);
ctx->pid_pat_list[ctx->parray[i]->id].patlen = ctx->parray[i]->len;
if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 0)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else if (ctx->pid_pat_list[ctx->parray[i]->id].case_state == 2)
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 2;
else
ctx->pid_pat_list[ctx->parray[i]->id].case_state = 3;
//}
} }
} }
@ -1264,9 +1247,7 @@ uint32_t SCACSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
; ;
@ -1305,9 +1286,7 @@ uint32_t SCACSearch(MpmCtx *mpm_ctx, MpmThreadCtx *mpm_thread_ctx,
buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + i - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
; ;
@ -1973,9 +1952,7 @@ uint32_t SCACCudaPacketResultsProcessing(Packet *p, MpmCtx *mpm_ctx,
buf + offset - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1, buf + offset - pid_pat_list[pids[k] & 0x0000FFFF].patlen + 1,
pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) { pid_pat_list[pids[k] & 0x0000FFFF].patlen) != 0) {
/* inside loop */ /* inside loop */
if (pid_pat_list[pids[k] & 0x0000FFFF].case_state != 3) { continue;
continue;
}
} }
if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) { if (pmq->pattern_id_bitarray[(pids[k] & 0x0000FFFF) / 8] & (1 << ((pids[k] & 0x0000FFFF) % 8))) {
; ;

3
src/util-mpm-ac.h
Unescape Escape View File

@ -1,4 +1,4 @@
/* Copyright (C) 2007-2010 Open Information Security Foundation /* Copyright (C) 2007-2014 Open Information Security Foundation
* *
* You can copy, redistribute or modify this Program under the terms of * You can copy, redistribute or modify this Program under the terms of
* the GNU General Public License version 2 as published by the Free * the GNU General Public License version 2 as published by the Free
@ -58,7 +58,6 @@ typedef struct SCACPattern_ {
typedef struct SCACPatternList_ { typedef struct SCACPatternList_ {
uint8_t *cs; uint8_t *cs;
uint16_t patlen; uint16_t patlen;
uint16_t case_state;
} SCACPatternList; } SCACPatternList;
typedef struct SCACOutputTable_ { typedef struct SCACOutputTable_ {

Write Preview
Loading…
Cancel
Save