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

Commit 7db9a51e authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: remove saveroute indirection in struct nf_afinfo 



This is only used by nf_queue.c and this function comes with no symbol
dependencies with IPv6, it just refers to structure layouts. Therefore,
we can replace it by a direct function call from where it belongs.

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

include/linux/netfilter.h

+0 −2
Original line number Diff line number Diff line
@@ -313,8 +313,6 @@ struct nf_afinfo { 
	unsigned short	family;

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

				 struct flowi *fl, bool strict);

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

				     struct nf_queue_entry *entry);

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

				   const struct nf_queue_entry *entry);

	int		route_key_size;

include/linux/netfilter_ipv4.h

+10 −0
Original line number Diff line number Diff line
@@ -6,6 +6,16 @@ 


#include <uapi/linux/netfilter_ipv4.h>



/* Extra routing may needed on local out, as the QUEUE target never returns

 * control to the table.

 */

struct ip_rt_info {

	__be32 daddr;

	__be32 saddr;

	u_int8_t tos;

	u_int32_t mark;

};



int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned addr_type);



#ifdef CONFIG_INET

include/linux/netfilter_ipv6.h

+9 −0
Original line number Diff line number Diff line
@@ -9,6 +9,15 @@ 


#include <uapi/linux/netfilter_ipv6.h>



/* Extra routing may needed on local out, as the QUEUE target never returns

 * control to the table.

 */

struct ip6_rt_info {

	struct in6_addr daddr;

	struct in6_addr saddr;

	u_int32_t mark;

};



/*

 * Hook functions for ipv6 to allow xt_* modules to be built-in even

 * if IPv6 is a module.

net/bridge/netfilter/nf_tables_bridge.c

+0 −6
Original line number Diff line number Diff line
@@ -95,11 +95,6 @@ static const struct nf_chain_type filter_bridge = { 
	},

};



static void nf_br_saveroute(const struct sk_buff *skb,

			    struct nf_queue_entry *entry)

{

}



static int nf_br_reroute(struct net *net, struct sk_buff *skb,

			 const struct nf_queue_entry *entry)

{
@@ -115,7 +110,6 @@ static int nf_br_route(struct net *net, struct dst_entry **dst, 
static const struct nf_afinfo nf_br_afinfo = {

	.family                 = AF_BRIDGE,

	.route                  = nf_br_route,

	.saveroute              = nf_br_saveroute,

	.reroute                = nf_br_reroute,

	.route_key_size         = 0,

};

net/ipv4/netfilter.c

+0 −28
Original line number Diff line number Diff line
@@ -80,33 +80,6 @@ int ip_route_me_harder(struct net *net, struct sk_buff *skb, unsigned int addr_t 
}

EXPORT_SYMBOL(ip_route_me_harder);



/*

 * Extra routing may needed on local out, as the QUEUE target never

 * returns control to the table.

 */



struct ip_rt_info {

	__be32 daddr;

	__be32 saddr;

	u_int8_t tos;

	u_int32_t mark;

};



static void nf_ip_saveroute(const struct sk_buff *skb,

			    struct nf_queue_entry *entry)

{

	struct ip_rt_info *rt_info = nf_queue_entry_reroute(entry);



	if (entry->state.hook == NF_INET_LOCAL_OUT) {

		const struct iphdr *iph = ip_hdr(skb);



		rt_info->tos = iph->tos;

		rt_info->daddr = iph->daddr;

		rt_info->saddr = iph->saddr;

		rt_info->mark = skb->mark;

	}

}



static int nf_ip_reroute(struct net *net, struct sk_buff *skb,

			 const struct nf_queue_entry *entry)

{
@@ -190,7 +163,6 @@ static int nf_ip_route(struct net *net, struct dst_entry **dst, 
static const struct nf_afinfo nf_ip_afinfo = {

	.family			= AF_INET,

	.route			= nf_ip_route,

	.saveroute		= nf_ip_saveroute,

	.reroute		= nf_ip_reroute,

	.route_key_size		= sizeof(struct ip_rt_info),

};