Revert "monitor: do not print generation ID with --echo"
Pablo Neira Ayuso
maintainerPATCH 1/1 Revert "monitor: do not print generation ID with --echo"
Revert 0e258556f7f3 ("monitor: do not print generation ID with --echo").
There is actually a kernel bug which is preventing from displaying this generation ID message.
Update the tests/shell to remove the last line of the --echo output which displays the generation ID once the "netfilter: nftables: fix netlink report logic in flowtable and genid" kernel fix is applied.
Signed-off-by Pablo Neira Ayuso <[email protected]>
--- src/monitor.c | 2 +- tests/shell/testcases/sets/0036add_set_element_expiration_0 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
src/monitor.c +1 -1
@@ -849,7 +849,7 @@ static int netlink_events_newgen_cb(const struct nlmsghdr *nlh, int type,break ; } } -if (!nft_output_echo (&monh->ctx->nft->output) && genid >=0 ) { +if (genid >=0 ) {nft_mon_print (monh,"# new generation %d" , genid);if (pid >=0 )nft_mon_print (monh," by process %d (%s)" , pid, name);
tests/shell/testcases/sets/0036add_set_element_expiration_0 +1 -1
@@ -6,7 +6,7 @@ RULESET="add table ip x add set ip x y { type ipv4_addr; flags dynamic,timeout; } add element ip x y { 1.1.1.1 timeout 30s expires 15s }" -test_output=$($NFT -e -f - <<< "$RULESET" 2>&1) +test_output=$($NFT -e -f - <<< "$RULESET" 2>&1 | head -n -1) if [ "$test_output" != "$RULESET" ] ; then $DIFF -u <(echo "$test_output") <(echo "$RULESET")
Signature · 1 line
2.20.1