From: Eric Garver <eric@garver.life>
Date: Fri, 6 Sep 2019 00:33:01 +0000 (-0400)
Subject: cache: fix --echo with index/position
X-Git-Tag: v0.9.3~84
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e57d4ff79fa166f2dea3686ca4fe051b656a8d2;p=thirdparty%2Fnftables.git

cache: fix --echo with index/position

Always call evaluate_cache_add() so it can set special flags - in this
case NFT_CACHE_UPDATE.

Fixes: 01e5c6f0ed03 ("src: add cache level flags")
Signed-off-by: Eric Garver <eric@garver.life>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/src/cache.c b/src/cache.c
index cffcbb62..a778650a 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -104,11 +104,9 @@ unsigned int cache_evaluate(struct nft_ctx *nft, struct list_head *cmds)
 		case CMD_ADD:
 		case CMD_INSERT:
 		case CMD_CREATE:
-			if (nft_output_echo(&nft->output)) {
-				flags = NFT_CACHE_FULL;
-				break;
-			}
 			flags = evaluate_cache_add(cmd, flags);
+			if (nft_output_echo(&nft->output))
+				flags |= NFT_CACHE_FULL;
 			break;
 		case CMD_REPLACE:
 			flags = NFT_CACHE_FULL;