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

Increase max pattern ID allowed in MPM AC-tile to 28-bits

Browse Source
pull/1295/head
Ken Steele 11 years ago committed by Victor Julien
parent 6717c356e3
commit d01d3324fc
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

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

@ -1081,8 +1081,8 @@ static inline void SCACTileInsertCaseSensitiveEntriesForPatterns(MpmCtx *mpm_ctx
for (k = 0; k < ctx->output_table[state].no_of_entries; k++) { for (k = 0; k < ctx->output_table[state].no_of_entries; k++) {
if (ctx->pattern_list[ctx->output_table[state].patterns[k]].cs != NULL) { if (ctx->pattern_list[ctx->output_table[state].patterns[k]].cs != NULL) {
/* TODO - Find better way to store this. */ /* TODO - Find better way to store this. */
ctx->output_table[state].patterns[k] &= 0x0000FFFF; ctx->output_table[state].patterns[k] &= 0x0FFFFFFF;
ctx->output_table[state].patterns[k] |= 1 << 16; ctx->output_table[state].patterns[k] |= 1 << 31;
} }
} }
} }
@ -1478,7 +1478,7 @@ int CheckMatch(SCACTileSearchCtx *ctx, PatternMatcherQueue *pmq,
uint32_t k; uint32_t k;
for (k = 0; k < no_of_entries; k++) { for (k = 0; k < no_of_entries; k++) {
MpmPatternIndex pindex = patterns[k] & 0x0000FFFF; MpmPatternIndex pindex = patterns[k] & 0x0FFFFFFF;
if (mpm_bitarray[pindex / 8] & (1 << (pindex % 8))) { if (mpm_bitarray[pindex / 8] & (1 << (pindex % 8))) {
/* Pattern already seen by this MPM. */ /* Pattern already seen by this MPM. */
/* NOTE: This is faster then rechecking if it is a case-sensitive match /* NOTE: This is faster then rechecking if it is a case-sensitive match
@ -1492,7 +1492,7 @@ int CheckMatch(SCACTileSearchCtx *ctx, PatternMatcherQueue *pmq,
} }
uint32_t pid = pattern_list[pindex].pid; uint32_t pid = pattern_list[pindex].pid;
/* Double check case-sensitve match now. */ /* Double check case-sensitve match now. */
if (patterns[k] & 0xFFFF0000) { if (patterns[k] >> 31) {
uint16_t patlen = pattern_list[pindex].patlen; uint16_t patlen = pattern_list[pindex].patlen;
if (SCMemcmpNZ(pattern_list[pindex].cs, buf_offset - patlen, patlen) != 0) { if (SCMemcmpNZ(pattern_list[pindex].cs, buf_offset - patlen, patlen) != 0) {
/* Case-sensitive match failed. */ /* Case-sensitive match failed. */

Write Preview
Loading…
Cancel
Save