diff options
author | Phil Sutter <phil@nwl.cc> | 2019-09-17 18:43:21 +0200 |
---|---|---|
committer | Phil Sutter <phil@nwl.cc> | 2019-10-18 11:57:24 +0200 |
commit | 4abb44c978d75656f69dd59f24522eb970881ccf (patch) | |
tree | 88a992be6606e03aeb378b79205d29316ca1eb7a /iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0 | |
parent | fe2c53d570bf7a301b0cb5aa25b1186a47378a6b (diff) |
xtables-restore: Introduce rule counter tokenizer function
The same piece of code appears three times, introduce a function to take
care of tokenizing and error reporting.
Pass buffer pointer via reference so it can be updated to point to after
the counters (if found).
While being at it, drop pointless casting when passing pcnt/bcnt to
add_argv().
Signed-off-by: Phil Sutter <phil@nwl.cc>
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0')
-rwxr-xr-x | iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0 | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0 b/iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0 new file mode 100755 index 00000000..5ac70682 --- /dev/null +++ b/iptables/tests/shell/testcases/ipt-restore/0008-restore-counters_0 @@ -0,0 +1,22 @@ +#!/bin/bash + +set -e + +DUMP="*filter +:foo - [23:42] +[13:37] -A foo -j ACCEPT +COMMIT +" + +EXPECT=":foo - [0:0] +[0:0] -A foo -j ACCEPT" + +$XT_MULTI iptables-restore <<< "$DUMP" +diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI iptables-save --counters | grep foo) + +# iptables-*-restore ignores custom chain counters :( +EXPECT=":foo - [0:0] +[13:37] -A foo -j ACCEPT" + +$XT_MULTI iptables-restore --counters <<< "$DUMP" +diff -u -Z <(echo -e "$EXPECT") <($XT_MULTI iptables-save --counters | grep foo) |