From: Pablo Neira Ayuso <pablo@netfilter.org>
Date: Mon, 16 Feb 2015 19:17:51 +0000 (+0100)
Subject: xtables-compat: remove unused fields from bridge and arp families
X-Git-Tag: v1.6.0~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2c6334181d4e7026dcd59f1360f81f2128b1b511;p=thirdparty%2Fiptables.git

xtables-compat: remove unused fields from bridge and arp families

These two families only work under nft compat, so leave unset the fields
that we don't use. Basically, we need neither the module autoload code
nor the native get/setsockopt() revision infrastructure since we use the
one that nft_compat provides through nfnetlink.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
---

diff --git a/libxtables/xtables.c b/libxtables/xtables.c
index 0200c7a3..9df12ce5 100644
--- a/libxtables/xtables.c
+++ b/libxtables/xtables.c
@@ -168,24 +168,17 @@ static const struct xtables_afinfo afinfo_ipv6 = {
 	.so_rev_target = IP6T_SO_GET_REVISION_TARGET,
 };
 
+/* Dummy families for arptables-compat and ebtables-compat. Leave structure
+ * fields that we don't use unset.
+ */
 static const struct xtables_afinfo afinfo_bridge = {
-	.kmod          = "eb_tables",
-	.proc_exists   = "/proc/net/eb_tables_names",
 	.libprefix     = "libebt_",
 	.family        = NFPROTO_BRIDGE,
-	.ipproto       = IPPROTO_IP,
-	.so_rev_match  = -1,
-	.so_rev_target = -1,
 };
 
 static const struct xtables_afinfo afinfo_arp = {
-	.kmod          = "arp_tables",
-	.proc_exists   = "/proc/net/eb_tables_names",
 	.libprefix     = "libarpt_",
 	.family        = NFPROTO_ARP,
-	.ipproto       = IPPROTO_IP,
-	.so_rev_match  = -1,
-	.so_rev_target = -1,
 };
 
 const struct xtables_afinfo *afinfo;