diff options
author | Patrick McHardy <kaber@trash.net> | 2012-12-09 14:06:08 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2012-12-09 15:17:27 +0100 |
commit | 7a5d23be7c1e25d3fb1130604dedf244abfa2ac4 (patch) | |
tree | 9be3c8a0bbaac25ce3775e1a49aba4e59d2c83d9 | |
parent | 1affe46773ea8ac6deacc8b1b126c7ad4708356f (diff) |
rule: reenable adjacent payload merging
Signed-off-by: Patrick McHardy <kaber@trash.net>
-rw-r--r-- | src/evaluate.c | 8 | ||||
-rw-r--r-- | src/rule.c | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 9e49e911..01c6bd78 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1192,6 +1192,7 @@ static int set_evaluate(struct eval_ctx *ctx, struct set *set) static int rule_evaluate(struct eval_ctx *ctx, struct rule *rule) { struct stmt *stmt, *tstmt = NULL; + struct error_record *erec; payload_ctx_init(&ctx->pctx, rule->handle.family); memset(&ctx->ectx, 0, sizeof(ctx->ectx)); @@ -1208,6 +1209,13 @@ static int rule_evaluate(struct eval_ctx *ctx, struct rule *rule) if (stmt->flags & STMT_F_TERMINAL) tstmt = stmt; } + + erec = rule_postprocess(rule); + if (erec != NULL) { + erec_queue(erec, ctx->msgs); + return -1; + } + return 0; } @@ -637,6 +637,5 @@ do_merge: struct error_record *rule_postprocess(struct rule *rule) { payload_try_merge(rule); - rule_print(rule); return NULL; } |