Fixup calculation of the minimum scan pattern lenght in some cases.

remotes/origin/master-1.0.x
Victor Julien 15 years ago
parent aa736b01d6
commit 9bbe43c019

@ -392,8 +392,13 @@ static inline int B2gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen,
//printf("\" cs \""); prt(p->cs,p->len);
//printf("\"\n");
if (scan)
if (scan) {
p->flags |= B2G_SCAN;
if (mpm_ctx->scan_maxlen < patlen) mpm_ctx->scan_maxlen = patlen;
if (mpm_ctx->scan_minlen == 0) mpm_ctx->scan_minlen = patlen;
else if (mpm_ctx->scan_minlen > patlen) mpm_ctx->scan_minlen = patlen;
}
}
/* we need a match */

@ -371,8 +371,13 @@ static inline int B3gAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen,
/* if we're reusing a pattern, check we need to check that it is a
* scan pattern if that is what we're adding. If so we set the pattern
* to be a scan pattern. */
if (scan)
if (scan) {
p->flags |= B3G_SCAN;
if (mpm_ctx->scan_maxlen < patlen) mpm_ctx->scan_maxlen = patlen;
if (mpm_ctx->scan_minlen == 0) mpm_ctx->scan_minlen = patlen;
else if (mpm_ctx->scan_minlen > patlen) mpm_ctx->scan_minlen = patlen;
}
}
/* we need a match */

@ -441,8 +441,12 @@ static inline int WmAddPattern(MpmCtx *mpm_ctx, uint8_t *pat, uint16_t patlen, u
/* if we're reusing a pattern, check we need to check that it is a
* scan pattern if that is what we're adding. If so we set the pattern
* to be a scan pattern. */
if (scan)
if (scan) {
p->flags = WUMANBER_SCAN;
if (mpm_ctx->scan_maxlen < patlen) mpm_ctx->scan_maxlen = patlen;
if (mpm_ctx->scan_minlen == 0) mpm_ctx->scan_minlen = patlen;
else if (mpm_ctx->scan_minlen > patlen) mpm_ctx->scan_minlen = patlen;
}
}
/* we need a match */

Loading…
Cancel
Save