diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-11-05 18:27:53 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2021-11-23 15:01:23 +0100 |
| commit | 22f2e1fca127b014dccf1006544e3179c9dc9764 (patch) | |
| tree | 9b0051ca24e7faa33daca6bf0de6c3e4acd27ba6 /iptables/nft-ipv4.c | |
| parent | 766e4872e10bccc12fa37dcf5380d3c99fcf1d75 (diff) | |
xshared: Share save_rule_details() with legacy
The function combines printing of input and output interfaces and
protocol parameter, all being IP family independent. Extend the function
to print fragment option ('-f'), too if requested. While being at it,
drop unused iptables_command_state parameter and reorder the remaining
ones a bit.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/nft-ipv4.c')
| -rw-r--r-- | iptables/nft-ipv4.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/iptables/nft-ipv4.c b/iptables/nft-ipv4.c index 287112d0..39d6e612 100644 --- a/iptables/nft-ipv4.c +++ b/iptables/nft-ipv4.c @@ -317,15 +317,10 @@ static void nft_ipv4_save_rule(const void *data, unsigned int format) save_ipv4_addr('d', &cs->fw.ip.dst, cs->fw.ip.dmsk.s_addr, cs->fw.ip.invflags & IPT_INV_DSTIP); - save_rule_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); - - if (cs->fw.ip.flags & IPT_F_FRAG) { - if (cs->fw.ip.invflags & IPT_INV_FRAG) - printf(" !"); - printf(" -f"); - } + save_rule_details(cs->fw.ip.iniface, cs->fw.ip.iniface_mask, + cs->fw.ip.outiface, cs->fw.ip.outiface_mask, + cs->fw.ip.proto, cs->fw.ip.flags & IPT_F_FRAG, + cs->fw.ip.invflags); save_matches_and_target(cs, cs->fw.ip.flags & IPT_F_GOTO, &cs->fw, format); |