|
 |
1dc35b |
From 44f264cec0399e235755b44efbf856232b2e7e22 Mon Sep 17 00:00:00 2001
|
|
|
1dc35b |
From: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Date: Fri, 15 Feb 2019 15:27:43 +0100
|
|
|
1dc35b |
Subject: [PATCH] arptables: Print space before comma and counters
|
|
|
1dc35b |
|
|
|
1dc35b |
Legacy arptables separates counters from rest of rule by ' , '. Assuming
|
|
|
1dc35b |
that scripts scraping 'arptables -vL' output match on this, make
|
|
|
1dc35b |
arptables-nft output conformant.
|
|
|
1dc35b |
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
1dc35b |
(cherry picked from commit 73a0c2ef36d15e8277f0e00337736668b325381a)
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
1dc35b |
---
|
|
|
1dc35b |
iptables/nft-arp.c | 2 +-
|
|
|
1dc35b |
.../arptables/0003-arptables-verbose-output_0 | 12 ++++++------
|
|
|
1dc35b |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
1dc35b |
|
|
|
1dc35b |
diff --git a/iptables/nft-arp.c b/iptables/nft-arp.c
|
|
|
1dc35b |
index b436570291b7c..aed4c2ab02604 100644
|
|
|
1dc35b |
--- a/iptables/nft-arp.c
|
|
|
1dc35b |
+++ b/iptables/nft-arp.c
|
|
|
1dc35b |
@@ -618,7 +618,7 @@ nft_arp_print_rule(struct nftnl_rule *r, unsigned int num, unsigned int format)
|
|
|
1dc35b |
print_matches_and_target(&cs, format);
|
|
|
1dc35b |
|
|
|
1dc35b |
if (!(format & FMT_NOCOUNTS)) {
|
|
|
1dc35b |
- printf(", pcnt=");
|
|
|
1dc35b |
+ printf(" , pcnt=");
|
|
|
1dc35b |
xtables_print_num(cs.counters.pcnt, format | FMT_NOTABLE);
|
|
|
1dc35b |
printf("-- bcnt=");
|
|
|
1dc35b |
xtables_print_num(cs.counters.bcnt, format | FMT_NOTABLE);
|
|
|
1dc35b |
diff --git a/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0 b/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0
|
|
|
1dc35b |
index 35126fa7d717c..3a9807a1cfe0b 100755
|
|
|
1dc35b |
--- a/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0
|
|
|
1dc35b |
+++ b/iptables/tests/shell/testcases/arptables/0003-arptables-verbose-output_0
|
|
|
1dc35b |
@@ -36,16 +36,16 @@ diff -u -Z <(echo -e "$VOUT5") <($XT_MULTI arptables -v -A OUTPUT $RULE5)
|
|
|
1dc35b |
diff -u -Z <(echo -e "$VOUT6") <($XT_MULTI arptables -v -A foo $RULE6)
|
|
|
1dc35b |
|
|
|
1dc35b |
EXPECT='Chain INPUT (policy ACCEPT 0 packets, 0 bytes)
|
|
|
1dc35b |
--j ACCEPT -i eth23 -o *, pcnt=0 -- bcnt=0
|
|
|
1dc35b |
--i eth23 -o *, pcnt=0 -- bcnt=0
|
|
|
1dc35b |
--j MARK -i eth23 -o * --set-mark 42, pcnt=0 -- bcnt=0
|
|
|
1dc35b |
+-j ACCEPT -i eth23 -o * , pcnt=0 -- bcnt=0
|
|
|
1dc35b |
+-i eth23 -o * , pcnt=0 -- bcnt=0
|
|
|
1dc35b |
+-j MARK -i eth23 -o * --set-mark 42 , pcnt=0 -- bcnt=0
|
|
|
1dc35b |
|
|
|
1dc35b |
Chain OUTPUT (policy ACCEPT 0 packets, 0 bytes)
|
|
|
1dc35b |
--j CLASSIFY -i * -o eth23 --set-class 23:42, pcnt=0 -- bcnt=0
|
|
|
1dc35b |
--j foo -i * -o eth23, pcnt=0 -- bcnt=0
|
|
|
1dc35b |
+-j CLASSIFY -i * -o eth23 --set-class 23:42 , pcnt=0 -- bcnt=0
|
|
|
1dc35b |
+-j foo -i * -o eth23 , pcnt=0 -- bcnt=0
|
|
|
1dc35b |
|
|
|
1dc35b |
Chain foo (1 references)
|
|
|
1dc35b |
--j mangle -i * -o eth23 --mangle-ip-s 10.0.0.1, pcnt=0 -- bcnt=0'
|
|
|
1dc35b |
+-j mangle -i * -o eth23 --mangle-ip-s 10.0.0.1 , pcnt=0 -- bcnt=0'
|
|
|
1dc35b |
|
|
|
1dc35b |
diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI arptables -v -n -L)
|
|
|
1dc35b |
|
|
|
1dc35b |
--
|
|
|
1dc35b |
2.21.0
|
|
|
1dc35b |
|