Skip to contentSkip to conversation

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

PATCH New Pablo Neira Ayuso 1 participant 1 message Feb 16, 2015 netfilter

lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 1/1 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.

---
 libxtables/xtables.c |   13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)
libxtables/xtables.c +3 -10
index 0200c7a..9df12ce 100644
@@ -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;
Signature · 1 line
1.7.10.4