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

Commit 3f87c08c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: move route indirection to struct nf_ipv6_ops 



We cannot make a direct call to nf_ip6_route() because that would result
in autoloading the 'ipv6' module because of symbol dependencies.
Therefore, define route indirection in nf_ipv6_ops where this really
belongs to.

For IPv4, we can indeed make a direct function call, which is faster,
given IPv4 is built-in in the networking code by default. Still,
CONFIG_INET=n and CONFIG_NETFILTER=y is possible, so define empty inline
stub for IPv4 in such case.

Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 7db9a51e

include/linux/netfilter.h

+2 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ struct nf_queue_entry; 


struct nf_afinfo {

	unsigned short	family;

	int		(*route)(struct net *net, struct dst_entry **dst,

				 struct flowi *fl, bool strict);

	int		(*reroute)(struct net *net, struct sk_buff *skb,

				   const struct nf_queue_entry *entry);

	int		route_key_size;
@@ -331,6 +329,8 @@ __sum16 nf_checksum(struct sk_buff *skb, unsigned int hook, 
__sum16 nf_checksum_partial(struct sk_buff *skb, unsigned int hook,

			    unsigned int dataoff, unsigned int len,

			    u_int8_t protocol, unsigned short family);

int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

	     bool strict, unsigned short family);



int nf_register_afinfo(const struct nf_afinfo *afinfo);

void nf_unregister_afinfo(const struct nf_afinfo *afinfo);

include/linux/netfilter_ipv4.h

+7 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, 
__sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook,

			       unsigned int dataoff, unsigned int len,

			       u_int8_t protocol);

int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

		bool strict);

#else

static inline __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook,

				     unsigned int dataoff, u_int8_t protocol)
@@ -38,6 +40,11 @@ static inline __sum16 nf_ip_checksum_partial(struct sk_buff *skb, 
{

	return 0;

}

static inline int nf_ip_route(struct net *net, struct dst_entry **dst,

			      struct flowi *fl, bool strict)

{

	return -EOPNOTSUPP;

}

#endif /* CONFIG_INET */



#endif /*__LINUX_IP_NETFILTER_H*/

include/linux/netfilter_ipv6.h

+2 −0
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ struct nf_ipv6_ops { 
	__sum16 (*checksum_partial)(struct sk_buff *skb, unsigned int hook,

				    unsigned int dataoff, unsigned int len,

				    u_int8_t protocol);

	int (*route)(struct net *net, struct dst_entry **dst, struct flowi *fl,

		     bool strict);

};



#ifdef CONFIG_NETFILTER

net/bridge/netfilter/nf_tables_bridge.c

+0 −7
Original line number Diff line number Diff line
@@ -101,15 +101,8 @@ static int nf_br_reroute(struct net *net, struct sk_buff *skb, 
	return 0;

}



static int nf_br_route(struct net *net, struct dst_entry **dst,

		       struct flowi *fl, bool strict __always_unused)

{

	return 0;

}



static const struct nf_afinfo nf_br_afinfo = {

	.family                 = AF_BRIDGE,

	.route                  = nf_br_route,

	.reroute                = nf_br_reroute,

	.route_key_size         = 0,

};

net/ipv4/netfilter.c

+3 −3
Original line number Diff line number Diff line
@@ -150,8 +150,8 @@ __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook, 
}

EXPORT_SYMBOL_GPL(nf_ip_checksum_partial);



static int nf_ip_route(struct net *net, struct dst_entry **dst,

		       struct flowi *fl, bool strict __always_unused)

int nf_ip_route(struct net *net, struct dst_entry **dst, struct flowi *fl,

		bool strict __always_unused)

{

	struct rtable *rt = ip_route_output_key(net, &fl->u.ip4);

	if (IS_ERR(rt))
@@ -159,10 +159,10 @@ static int nf_ip_route(struct net *net, struct dst_entry **dst, 
	*dst = &rt->dst;

	return 0;

}

EXPORT_SYMBOL_GPL(nf_ip_route);



static const struct nf_afinfo nf_ip_afinfo = {

	.family			= AF_INET,

	.route			= nf_ip_route,

	.reroute		= nf_ip_reroute,

	.route_key_size		= sizeof(struct ip_rt_info),

};