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>

diff --git a/iptables/ip6tables.c b/iptables/ip6tables.c
index ec0ae759875e712c260c5131b50fba2b62bdb365..1c9b076196e8f0aaf9dc1a5dfec9177703c010e0 100644 (file)
--- 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);

diff --git a/iptables/iptables.c b/iptables/iptables.c
index 246526a55a3c9b4924779f355701fad068e17f6b..7802bd6d95bd0a479b426102a9b80e7117cc3340 100644 (file)
--- a/iptables/iptables.c
+++ b/iptables/iptables.c
@@ -720,32 +720,6 @@ static void print_proto(uint16_t proto, int invert)
 
 #define IP_PARTS(n) IP_PARTS_NATIVE(ntohl(n))
 
-/* 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 int print_match_save(const struct xt_entry_match *e,
                        const struct ipt_ip *ip)
 {
@@ -830,10 +804,10 @@ void print_rule4(const struct ipt_entry *e,
        print_ip("-d", e->ip.dst.s_addr, e->ip.dmsk.s_addr,
                        e->ip.invflags & IPT_INV_DSTIP);
 
-       print_iface('i', e->ip.iniface, e->ip.iniface_mask,
+       save_iface('i', e->ip.iniface, e->ip.iniface_mask,
                    e->ip.invflags & IPT_INV_VIA_IN);
 
-       print_iface('o', e->ip.outiface, e->ip.outiface_mask,
+       save_iface('o', e->ip.outiface, e->ip.outiface_mask,
                    e->ip.invflags & IPT_INV_VIA_OUT);
 
        print_proto(e->ip.proto, e->ip.invflags & XT_INV_PROTO);

diff --git a/iptables/nft-shared.c b/iptables/nft-shared.c
index 082cc0e2df7454a5057f0736e9d4e0a3d48e5cba..b86cc086bed1c75aae26bda78ed7db07ee69ad3a 100644 (file)
--- a/iptables/nft-shared.c
+++ b/iptables/nft-shared.c
@@ -785,28 +785,6 @@ void print_rule_details(const struct iptables_command_state *cs,
        }
 }
 
-static void
-print_iface(char letter, const char *iface, const unsigned char *mask, int inv)
-{
-       unsigned int i;
-
-       if (mask[0] == 0)
-               return;
-
-       printf("%s -%c ", inv ? " !" : "", letter);
-
-       for (i = 0; i < IFNAMSIZ; i++) {
-               if (mask[i] != 0) {
-                       if (iface[i] != '\0')
-                               printf("%c", iface[i]);
-                       } else {
-                               if (iface[i-1] != '\0')
-                                       printf("+");
-                               break;
-               }
-       }
-}
-
 void save_rule_details(const struct iptables_command_state *cs,
                       uint8_t invflags, uint16_t proto,
                       const char *iniface,
@@ -815,11 +793,11 @@ void save_rule_details(const struct iptables_command_state *cs,
                       unsigned const char *outiface_mask)
 {
        if (iniface != NULL) {
-               print_iface('i', iniface, iniface_mask,
+               save_iface('i', iniface, iniface_mask,
                            invflags & IPT_INV_VIA_IN);
        }
        if (outiface != NULL) {
-               print_iface('o', outiface, outiface_mask,
+               save_iface('o', outiface, outiface_mask,
                            invflags & IPT_INV_VIA_OUT);
        }
 

diff --git a/iptables/xshared.c b/iptables/xshared.c
index bd545d6b31908206baf846c5dcb51a9538bd95b9..db03aaaa324b0dabd2ef16296dd2c836ae7f9544 100644 (file)
--- a/iptables/xshared.c
+++ b/iptables/xshared.c
@@ -637,6 +637,31 @@ void print_ifaces(const char *iniface, const char *outiface, uint8_t invflags,
        printf(FMT("%-6s ", "out %s "), iface);
 }
 
+/* This assumes that mask is contiguous, and byte-bounded. */
+void save_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;
+               }
+       }
+}
+
 void command_match(struct iptables_command_state *cs, bool invert)
 {
        struct option *opts = xt_params->opts;

diff --git a/iptables/xshared.h b/iptables/xshared.h
index 6d6acbca13da27f1cee8ef30e8632db91043aa37..3281ce584476c41f572508b8f33527b164ab93f2 100644 (file)
--- a/iptables/xshared.h
+++ b/iptables/xshared.h
@@ -226,6 +226,8 @@ void print_ipv6_addresses(const struct ip6t_entry *fw6, unsigned int format);
 
 void print_ifaces(const char *iniface, const char *outiface, uint8_t invflags,
                  unsigned int format);
+void save_iface(char letter, const char *iface,
+               const unsigned char *mask, int invert);
 
 void command_match(struct iptables_command_state *cs, bool invert);
 const char *xt_parse_target(const char *targetname);