diff options
| author | Florian Westphal <fw@strlen.de> | 2018-05-05 09:59:43 +0200 |
|---|---|---|
| committer | Florian Westphal <fw@strlen.de> | 2018-05-05 10:55:55 +0200 |
| commit | d79a7f18e19b9534e44022d58e2802c9cd70568d (patch) | |
| tree | 43c71776db0f9545c4803c701737dd879a21048a | |
| parent | d1eb4d58729736773d1c5cc106451e2851427850 (diff) | |
xtables-compat: output -s,d first during save, just like iptables
Signed-off-by: Florian Westphal <fw@strlen.de>
| -rw-r--r-- | iptables/nft-ipv4.c | 10 | ||||
| -rw-r--r-- | iptables/nft-ipv6.c | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c index e383cc9f..8193ac3c 100644 --- a/iptables/nft-ipv4.c +++ b/iptables/nft-ipv4.c @@ -339,6 +339,11 @@ static void nft_ipv4_save_firewall(const void *data, unsigned int format) { const struct iptables_command_state *cs = data; + save_ipv4_addr('s', &cs->fw.ip.src, cs->fw.ip.smsk.s_addr, + cs->fw.ip.invflags & IPT_INV_SRCIP); + save_ipv4_addr('d', &cs->fw.ip.dst, cs->fw.ip.dmsk.s_addr, + cs->fw.ip.invflags & IPT_INV_DSTIP); + save_firewall_details(cs, cs->fw.ip.invflags, cs->fw.ip.proto, cs->fw.ip.iniface, cs->fw.ip.iniface_mask, cs->fw.ip.outiface, cs->fw.ip.outiface_mask); @@ -349,11 +354,6 @@ static void nft_ipv4_save_firewall(const void *data, unsigned int format) printf("-f "); } - save_ipv4_addr('s', &cs->fw.ip.src, cs->fw.ip.smsk.s_addr, - cs->fw.ip.invflags & IPT_INV_SRCIP); - save_ipv4_addr('d', &cs->fw.ip.dst, cs->fw.ip.dmsk.s_addr, - cs->fw.ip.invflags & IPT_INV_DSTIP); - save_matches_and_target(cs->matches, cs->target, cs->jumpto, cs->fw.ip.flags, &cs->fw); diff --git a/iptables/nft-ipv6.c b/iptables/nft-ipv6.c index 33f77ebf..10c81d95 100644 --- a/iptables/nft-ipv6.c +++ b/iptables/nft-ipv6.c @@ -272,16 +272,16 @@ static void nft_ipv6_save_firewall(const void *data, unsigned int format) { const struct iptables_command_state *cs = data; - save_firewall_details(cs, cs->fw6.ipv6.invflags, cs->fw6.ipv6.proto, - cs->fw6.ipv6.iniface, cs->fw6.ipv6.iniface_mask, - cs->fw6.ipv6.outiface, - cs->fw6.ipv6.outiface_mask); - save_ipv6_addr('s', &cs->fw6.ipv6.src, cs->fw6.ipv6.invflags & IP6T_INV_SRCIP); save_ipv6_addr('d', &cs->fw6.ipv6.dst, cs->fw6.ipv6.invflags & IP6T_INV_DSTIP); + save_firewall_details(cs, cs->fw6.ipv6.invflags, cs->fw6.ipv6.proto, + cs->fw6.ipv6.iniface, cs->fw6.ipv6.iniface_mask, + cs->fw6.ipv6.outiface, + cs->fw6.ipv6.outiface_mask); + save_matches_and_target(cs->matches, cs->target, cs->jumpto, cs->fw6.ipv6.flags, &cs->fw6); |