From: Patrick McHardy <kaber@trash.net>
Date: Sun, 9 Dec 2012 13:06:08 +0000 (+0100)
Subject: rule: reenable adjacent payload merging
X-Git-Tag: v0.099~145
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7a5d23be7c1e25d3fb1130604dedf244abfa2ac4;p=thirdparty%2Fnftables.git

rule: reenable adjacent payload merging

Signed-off-by: Patrick McHardy <kaber@trash.net>
---

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;
 }
 
diff --git a/src/rule.c b/src/rule.c
index 9c3b62f7..61e16e75 100644
--- a/src/rule.c
+++ b/src/rule.c
@@ -637,6 +637,5 @@ do_merge:
 struct error_record *rule_postprocess(struct rule *rule)
 {
 	payload_try_merge(rule);
-	rule_print(rule);
 	return NULL;
 }