From: Varsha Rao <rvarsha016@gmail.com>
Date: Tue, 6 Jun 2017 06:25:40 +0000 (+0530)
Subject: src: Remove expire information from list stateless ruleset.
X-Git-Tag: v0.8~153
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=37988cf255e51efba0d81dbc43eb4f0a41e99813;p=thirdparty%2Fnftables.git

src: Remove expire information from list stateless ruleset.

As expires is stateful information. This patch removes expire
information from list stateless ruleset. With nft -s option, the
ruleset will be as following.

table ip firewall {
        set host {
                type ipv4_addr
                flags timeout
                elements = { 10.0.0.2 timeout 10m }
        }
}

Signed-off-by: Varsha Rao <rvarsha016@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/expression.c b/src/expression.c
index 55dd3911..4fef8300 100644
--- a/src/expression.c
+++ b/src/expression.c
@@ -962,7 +962,7 @@ static void set_elem_expr_print(const struct expr *expr)
 		printf(" timeout ");
 		time_print(expr->timeout / 1000);
 	}
-	if (expr->expiration) {
+	if (!stateless_output && expr->expiration) {
 		printf(" expires ");
 		time_print(expr->expiration / 1000);
 	}