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

fix ac, ac-gfbs to support new changes to util-mpm.h + remove some junk code

Browse Source
remotes/origin/master-1.1.x
Anoop Saldanha 15 years ago committed by Victor Julien
parent b9a770740a
commit 4b2cf7e125
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File

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

@ -383,8 +383,6 @@ static int SCACGfbsAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen,
}
}
mpm_ctx->total_pattern_cnt++;
return 0;
error:
@ -429,10 +427,10 @@ static inline int SCACGfbsInitNewState(MpmCtx *mpm_ctx)
/* \todo using it temporarily now during dev, since I have restricted
* state var in SCACGfbsCtx->state_table to uint16_t. */
if (ctx->state_count > 65536) {
printf("state count exceeded\n");
exit(EXIT_FAILURE);
}
//if (ctx->state_count > 65536) {
// printf("state count exceeded\n");
// exit(EXIT_FAILURE);
//}
return ctx->state_count++;
}
@ -1339,7 +1337,6 @@ void SCACGfbsPrintInfo(MpmCtx *mpm_ctx)
printf(" SCACGfbsPattern %" PRIuMAX "\n", (uintmax_t)sizeof(SCACGfbsPattern));
printf(" SCACGfbsPattern %" PRIuMAX "\n", (uintmax_t)sizeof(SCACGfbsPattern));
printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
printf("Total Patterns: %" PRIu32 "\n", mpm_ctx->total_pattern_cnt);
printf("Smallest: %" PRIu32 "\n", mpm_ctx->minlen);
printf("Largest: %" PRIu32 "\n", mpm_ctx->maxlen);
printf("Total states in the state table: %" PRIu32 "\n", ctx->state_count);

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

@ -384,8 +384,6 @@ static int SCACAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen,
}
}
mpm_ctx->total_pattern_cnt++;
return 0;
error:
@ -430,10 +428,10 @@ static inline int SCACInitNewState(MpmCtx *mpm_ctx)
/* \todo using it temporarily now during dev, since I have restricted
* state var in SCACCtx->state_table to uint16_t. */
if (ctx->state_count > 65536) {
printf("state count exceeded\n");
exit(EXIT_FAILURE);
}
//if (ctx->state_count > 65536) {
// printf("state count exceeded\n");
// exit(EXIT_FAILURE);
//}
return ctx->state_count++;
}
@ -1209,7 +1207,6 @@ void SCACPrintInfo(MpmCtx *mpm_ctx)
printf(" SCACPattern %" PRIuMAX "\n", (uintmax_t)sizeof(SCACPattern));
printf(" SCACPattern %" PRIuMAX "\n", (uintmax_t)sizeof(SCACPattern));
printf("Unique Patterns: %" PRIu32 "\n", mpm_ctx->pattern_cnt);
printf("Total Patterns: %" PRIu32 "\n", mpm_ctx->total_pattern_cnt);
printf("Smallest: %" PRIu32 "\n", mpm_ctx->minlen);
printf("Largest: %" PRIu32 "\n", mpm_ctx->maxlen);
printf("Total states in the state table: %" PRIu32 "\n", ctx->state_count);

Write Preview
Loading…
Cancel
Save