diff options
| author | Phil Sutter <phil@nwl.cc> | 2021-11-05 18:02:13 +0100 |
|---|---|---|
| committer | Phil Sutter <phil@nwl.cc> | 2021-11-23 15:01:23 +0100 |
| commit | 766e4872e10bccc12fa37dcf5380d3c99fcf1d75 (patch) | |
| tree | 75592710c2f9acb76903a187dbeebb6d3ce56797 /iptables/ip6tables.c | |
| parent | b5881e7f22d42a8b00acbdbab296b71572ddb903 (diff) | |
xshared: Share print_iface() function
Merge the three identical copies into one and name it 'save_iface' (as
the printed syntax is for "save"-format). Leave arptables alone for now,
its rather complicated whitespace printing doesn't allow for use of the
shared function. Also keep ebtables' custom implementation, it is used
for the --logical-in/--logical-out long-options, too. Apart from that,
ebtables-nft does not use a mask, at all.
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'iptables/ip6tables.c')
| -rw-r--r-- | iptables/ip6tables.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c index ec0ae759..1c9b0761 100644 --- a/iptables/ip6tables.c +++ b/iptables/ip6tables.c @@ -707,32 +707,6 @@ list_entries(const xt_chainlabel chain, int rulenum, int verbose, int numeric, return found; } -/* This assumes that mask is contiguous, and byte-bounded. */ -static void -print_iface(char letter, const char *iface, const unsigned char *mask, - int invert) -{ - unsigned int i; - - if (mask[0] == 0) - return; - - printf("%s -%c ", invert ? " !" : "", letter); - - for (i = 0; i < IFNAMSIZ; i++) { - if (mask[i] != 0) { - if (iface[i] != '\0') - printf("%c", iface[i]); - } else { - /* we can access iface[i-1] here, because - * a few lines above we make sure that mask[0] != 0 */ - if (iface[i-1] != '\0') - printf("+"); - break; - } - } -} - static void print_proto(uint16_t proto, int invert) { if (proto) { @@ -821,10 +795,10 @@ void print_rule6(const struct ip6t_entry *e, print_ip("-d", &(e->ipv6.dst), &(e->ipv6.dmsk), e->ipv6.invflags & IP6T_INV_DSTIP); - print_iface('i', e->ipv6.iniface, e->ipv6.iniface_mask, + save_iface('i', e->ipv6.iniface, e->ipv6.iniface_mask, e->ipv6.invflags & IP6T_INV_VIA_IN); - print_iface('o', e->ipv6.outiface, e->ipv6.outiface_mask, + save_iface('o', e->ipv6.outiface, e->ipv6.outiface_mask, e->ipv6.invflags & IP6T_INV_VIA_OUT); print_proto(e->ipv6.proto, e->ipv6.invflags & XT_INV_PROTO); |