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

Commit 31ad3dd6 authored by Florian Westphal's avatar Florian Westphal Committed by Patrick McHardy
Browse files

netfilter: af_info: add network namespace parameter to route hook 



This is required to eventually replace the rt6_lookup call in
xt_addrtype.c with nf_afinfo->route().

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent a09d1977

include/linux/netfilter.h

+2 −1
Original line number Diff line number Diff line
@@ -270,7 +270,8 @@ struct nf_afinfo { 
					    unsigned int dataoff,

					    unsigned int len,

					    u_int8_t protocol);

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

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

				 struct flowi *fl);

	void		(*saveroute)(const struct sk_buff *skb,

				     struct nf_queue_entry *entry);

	int		(*reroute)(struct sk_buff *skb,

net/ipv4/netfilter.c

+3 −2
Original line number Diff line number Diff line
@@ -221,9 +221,10 @@ static __sum16 nf_ip_checksum_partial(struct sk_buff *skb, unsigned int hook, 
	return csum;

}



static int nf_ip_route(struct dst_entry **dst, struct flowi *fl)

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

		       struct flowi *fl)

{

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

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

	if (IS_ERR(rt))

		return PTR_ERR(rt);

	*dst = &rt->dst;

net/ipv6/netfilter.c

+3 −2
Original line number Diff line number Diff line
@@ -90,9 +90,10 @@ static int nf_ip6_reroute(struct sk_buff *skb, 
	return 0;

}



static int nf_ip6_route(struct dst_entry **dst, struct flowi *fl)

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

			struct flowi *fl)

{

	*dst = ip6_route_output(&init_net, NULL, &fl->u.ip6);

	*dst = ip6_route_output(net, NULL, &fl->u.ip6);

	return (*dst)->error;

}

net/netfilter/nf_conntrack_h323_main.c

+4 −4
Original line number Diff line number Diff line
@@ -731,9 +731,9 @@ static int callforward_do_filter(const union nf_inet_addr *src, 


		memset(&fl2, 0, sizeof(fl2));

		fl2.daddr = dst->ip;

		if (!afinfo->route((struct dst_entry **)&rt1,

		if (!afinfo->route(&init_net, (struct dst_entry **)&rt1,

				   flowi4_to_flowi(&fl1))) {

			if (!afinfo->route((struct dst_entry **)&rt2,

			if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,

					   flowi4_to_flowi(&fl2))) {

				if (rt1->rt_gateway == rt2->rt_gateway &&

				    rt1->dst.dev  == rt2->dst.dev)
@@ -755,9 +755,9 @@ static int callforward_do_filter(const union nf_inet_addr *src, 


		memset(&fl2, 0, sizeof(fl2));

		ipv6_addr_copy(&fl2.daddr, &dst->in6);

		if (!afinfo->route((struct dst_entry **)&rt1,

		if (!afinfo->route(&init_net, (struct dst_entry **)&rt1,

				   flowi6_to_flowi(&fl1))) {

			if (!afinfo->route((struct dst_entry **)&rt2,

			if (!afinfo->route(&init_net, (struct dst_entry **)&rt2,

					   flowi6_to_flowi(&fl2))) {

				if (!memcmp(&rt1->rt6i_gateway, &rt2->rt6i_gateway,

					    sizeof(rt1->rt6i_gateway)) &&

net/netfilter/xt_TCPMSS.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static u_int32_t tcpmss_reverse_mtu(const struct sk_buff *skb, 
	rcu_read_lock();

	ai = nf_get_afinfo(family);

	if (ai != NULL)

		ai->route((struct dst_entry **)&rt, &fl);

		ai->route(&init_net, (struct dst_entry **)&rt, &fl);

	rcu_read_unlock();



	if (rt != NULL) {