Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7108a20 authored by Jan Engelhardt's avatar Jan Engelhardt Committed by Patrick McHardy
Browse files

netfilter: xtables: move extension arguments into compound structure (1/6) 



The function signatures for Xtables extensions have grown over time.
It involves a lot of typing/replication, and also a bit of stack space
even if they are not used. Realize an NFWS2008 idea and pack them into
structs. The skb remains outside of the struct so gcc can continue to
apply its optimizations.

This patch does this for match extensions' match functions.

A few ambiguities have also been addressed. The "offset" parameter for
example has been renamed to "fragoff" (there are so many different
offsets already) and "protoff" to "thoff" (there is more than just one
protocol here, so clarify).

Signed-off-by: default avatarJan Engelhardt <jengelh@medozas.de>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent c2df73de

include/linux/netfilter/x_tables.h

+21 −7
Original line number Diff line number Diff line
@@ -173,6 +173,26 @@ struct xt_counters_info 


#include <linux/netdevice.h>



/**

 * struct xt_match_param - parameters for match extensions' match functions

 *

 * @in:		input netdevice

 * @out:	output netdevice

 * @match:	struct xt_match through which this function was invoked

 * @matchinfo:	per-match data

 * @fragoff:	packet is a fragment, this is the data offset

 * @thoff:	position of transport header relative to skb->data

 * @hotdrop:	drop packet if we had inspection problems

 */

struct xt_match_param {

	const struct net_device *in, *out;

	const struct xt_match *match;

	const void *matchinfo;

	int fragoff;

	unsigned int thoff;

	bool *hotdrop;

};



struct xt_match

{

	struct list_head list;
@@ -185,13 +205,7 @@ struct xt_match 
	   non-linear skb, using skb_header_pointer and

	   skb_ip_make_writable. */

	bool (*match)(const struct sk_buff *skb,

		      const struct net_device *in,

		      const struct net_device *out,

		      const struct xt_match *match,

		      const void *matchinfo,

		      int offset,

		      unsigned int protoff,

		      bool *hotdrop);

		      const struct xt_match_param *);



	/* Called when user tries to insert an entry of this type. */

	/* Should return true or false. */

net/bridge/netfilter/ebt_802_3.c

+2 −4
Original line number Diff line number Diff line
@@ -13,11 +13,9 @@ 
#include <linux/netfilter_bridge/ebt_802_3.h>



static bool

ebt_802_3_mt(const struct sk_buff *skb, const struct net_device *in,

	     const struct net_device *out, const struct xt_match *match,

	     const void *data, int offset, unsigned int protoff, bool *hotdrop)

ebt_802_3_mt(const struct sk_buff *skb, const struct xt_match_param *par)

{

	const struct ebt_802_3_info *info = data;

	const struct ebt_802_3_info *info = par->matchinfo;

	const struct ebt_802_3_hdr *hdr = ebt_802_3_hdr(skb);

	__be16 type = hdr->llc.ui.ctrl & IS_UI ? hdr->llc.ui.type : hdr->llc.ni.type;

net/bridge/netfilter/ebt_among.c

+2 −4
Original line number Diff line number Diff line
@@ -128,11 +128,9 @@ static int get_ip_src(const struct sk_buff *skb, __be32 *addr) 
}



static bool

ebt_among_mt(const struct sk_buff *skb, const struct net_device *in,

	     const struct net_device *out, const struct xt_match *match,

	     const void *data, int offset, unsigned int protoff, bool *hotdrop)

ebt_among_mt(const struct sk_buff *skb, const struct xt_match_param *par)

{

	const struct ebt_among_info *info = data;

	const struct ebt_among_info *info = par->matchinfo;

	const char *dmac, *smac;

	const struct ebt_mac_wormhash *wh_dst, *wh_src;

	__be32 dip = 0, sip = 0;

net/bridge/netfilter/ebt_arp.c

+2 −4
Original line number Diff line number Diff line
@@ -16,11 +16,9 @@ 
#include <linux/netfilter_bridge/ebt_arp.h>



static bool

ebt_arp_mt(const struct sk_buff *skb, const struct net_device *in,

	   const struct net_device *out, const struct xt_match *match,

	   const void *data, int offset, unsigned int protoff, bool *hotdrop)

ebt_arp_mt(const struct sk_buff *skb, const struct xt_match_param *par)

{

	const struct ebt_arp_info *info = data;

	const struct ebt_arp_info *info = par->matchinfo;

	const struct arphdr *ah;

	struct arphdr _arph;

net/bridge/netfilter/ebt_ip.c

+2 −4
Original line number Diff line number Diff line
@@ -25,11 +25,9 @@ struct tcpudphdr { 
};



static bool

ebt_ip_mt(const struct sk_buff *skb, const struct net_device *in,

	  const struct net_device *out, const struct xt_match *match,

	  const void *data, int offset, unsigned int protoff, bool *hotdrop)

ebt_ip_mt(const struct sk_buff *skb, const struct xt_match_param *par)

{

	const struct ebt_ip_info *info = data;

	const struct ebt_ip_info *info = par->matchinfo;

	const struct iphdr *ih;

	struct iphdr _iph;

	const struct tcpudphdr *pptr;