Commit 2c205dd3 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: add struct nf_nat_hook and use it 



Move decode_session() and parse_nat_setup_hook() indirections to struct
nf_nat_hook structure.

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

include/linux/netfilter.h

+16 −5
Original line number Diff line number Diff line
@@ -320,18 +320,29 @@ int nf_route(struct net *net, struct dst_entry **dst, struct flowi *fl, 
int nf_reroute(struct sk_buff *skb, struct nf_queue_entry *entry);



#include <net/flow.h>

extern void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);



struct nf_conn;

enum nf_nat_manip_type;

struct nlattr;



struct nf_nat_hook {

	int (*parse_nat_setup)(struct nf_conn *ct, enum nf_nat_manip_type manip,

			       const struct nlattr *attr);

	void (*decode_session)(struct sk_buff *skb, struct flowi *fl);

};



extern struct nf_nat_hook __rcu *nf_nat_hook;



static inline void

nf_nat_decode_session(struct sk_buff *skb, struct flowi *fl, u_int8_t family)

{

#ifdef CONFIG_NF_NAT_NEEDED

	void (*decodefn)(struct sk_buff *, struct flowi *);

	struct nf_nat_hook *nat_hook;



	rcu_read_lock();

	decodefn = rcu_dereference(nf_nat_decode_session_hook);

	if (decodefn)

		decodefn(skb, fl);

	nat_hook = rcu_dereference(nf_nat_hook);

	if (nat_hook->decode_session)

		nat_hook->decode_session(skb, fl);

	rcu_read_unlock();

#endif

}

include/net/netfilter/nf_nat_core.h

+0 −7
Original line number Diff line number Diff line
@@ -26,11 +26,4 @@ static inline int nf_nat_initialized(struct nf_conn *ct, 
		return ct->status & IPS_DST_NAT_DONE;

}



struct nlattr;



extern int

(*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct,

				  enum nf_nat_manip_type manip,

				  const struct nlattr *attr);



#endif /* _NF_NAT_CORE_H */

net/netfilter/core.c

+3 −5
Original line number Diff line number Diff line
@@ -574,6 +574,9 @@ void (*ip_ct_attach)(struct sk_buff *, const struct sk_buff *) 
		__rcu __read_mostly;

EXPORT_SYMBOL(ip_ct_attach);



struct nf_nat_hook __rcu *nf_nat_hook __read_mostly;

EXPORT_SYMBOL_GPL(nf_nat_hook);



void nf_ct_attach(struct sk_buff *new, const struct sk_buff *skb)

{

	void (*attach)(struct sk_buff *, const struct sk_buff *);
@@ -608,11 +611,6 @@ const struct nf_conntrack_zone nf_ct_zone_dflt = { 
EXPORT_SYMBOL_GPL(nf_ct_zone_dflt);

#endif /* CONFIG_NF_CONNTRACK */



#ifdef CONFIG_NF_NAT_NEEDED

void (*nf_nat_decode_session_hook)(struct sk_buff *, struct flowi *);

EXPORT_SYMBOL(nf_nat_decode_session_hook);

#endif



static void __net_init __netfilter_net_init(struct nf_hook_entries **e, int max)

{

	int h;

net/netfilter/nf_conntrack_core.c

+0 −5
Original line number Diff line number Diff line
@@ -58,11 +58,6 @@ 


#include "nf_internals.h"



int (*nfnetlink_parse_nat_setup_hook)(struct nf_conn *ct,

				      enum nf_nat_manip_type manip,

				      const struct nlattr *attr) __read_mostly;

EXPORT_SYMBOL_GPL(nfnetlink_parse_nat_setup_hook);



__cacheline_aligned_in_smp spinlock_t nf_conntrack_locks[CONNTRACK_LOCKS];

EXPORT_SYMBOL_GPL(nf_conntrack_locks);

net/netfilter/nf_conntrack_netlink.c

+5 −5
Original line number Diff line number Diff line
@@ -1431,11 +1431,11 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, 
			  enum nf_nat_manip_type manip,

			  const struct nlattr *attr)

{

	typeof(nfnetlink_parse_nat_setup_hook) parse_nat_setup;

	struct nf_nat_hook *nat_hook;

	int err;



	parse_nat_setup = rcu_dereference(nfnetlink_parse_nat_setup_hook);

	if (!parse_nat_setup) {

	nat_hook = rcu_dereference(nf_nat_hook);

	if (!nat_hook) {

#ifdef CONFIG_MODULES

		rcu_read_unlock();

		nfnl_unlock(NFNL_SUBSYS_CTNETLINK);
@@ -1446,13 +1446,13 @@ ctnetlink_parse_nat_setup(struct nf_conn *ct, 
		}

		nfnl_lock(NFNL_SUBSYS_CTNETLINK);

		rcu_read_lock();

		if (nfnetlink_parse_nat_setup_hook)

		if (nat_hook->parse_nat_setup)

			return -EAGAIN;

#endif

		return -EOPNOTSUPP;

	}



	err = parse_nat_setup(ct, manip, attr);

	err = nat_hook->parse_nat_setup(ct, manip, attr);

	if (err == -EAGAIN) {

#ifdef CONFIG_MODULES

		rcu_read_unlock();