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

Commit cc01dcbd authored by Patrick McHardy's avatar Patrick McHardy Committed by David S. Miller
Browse files

[NETFILTER]: nf_nat: pass manip type instead of hook to nf_nat_setup_info 



nf_nat_setup_info gets the hook number and translates that to the
manip type to perform. This is a relict from the time when one
manip per hook could exist, the exact hook number doesn't matter
anymore, its converted to the manip type. Most callers already
know what kind of NAT they want to perform, so pass the maniptype
in directly.

Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ce4b1ceb

include/net/netfilter/nf_nat.h

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ struct nf_conn_nat 
/* Set up the info structure to map into this range. */

extern unsigned int nf_nat_setup_info(struct nf_conn *ct,

				      const struct nf_nat_range *range,

				      unsigned int hooknum);

				      enum nf_nat_manip_type maniptype);



/* Is this tuple already taken? (not by us)*/

extern int nf_nat_used_tuple(const struct nf_conntrack_tuple *tuple,

net/ipv4/netfilter/ipt_MASQUERADE.c

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ masquerade_tg(struct sk_buff *skb, const struct net_device *in, 
		  mr->range[0].min, mr->range[0].max });



	/* Hand modified range to generic setup. */

	return nf_nat_setup_info(ct, &newrange, hooknum);

	return nf_nat_setup_info(ct, &newrange, IP_NAT_MANIP_SRC);

}



static int

net/ipv4/netfilter/ipt_NETMAP.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ netmap_tg(struct sk_buff *skb, const struct net_device *in, 
		  mr->range[0].min, mr->range[0].max });



	/* Hand modified range to generic setup. */

	return nf_nat_setup_info(ct, &newrange, hooknum);

	return nf_nat_setup_info(ct, &newrange, HOOK2MANIP(hooknum));

}



static struct xt_target netmap_tg_reg __read_mostly = {

net/ipv4/netfilter/ipt_REDIRECT.c

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ redirect_tg(struct sk_buff *skb, const struct net_device *in, 
		  mr->range[0].min, mr->range[0].max });



	/* Hand modified range to generic setup. */

	return nf_nat_setup_info(ct, &newrange, hooknum);

	return nf_nat_setup_info(ct, &newrange, IP_NAT_MANIP_DST);

}



static struct xt_target redirect_tg_reg __read_mostly = {

net/ipv4/netfilter/nf_nat_core.c

+3 −6
Original line number Diff line number Diff line
@@ -277,12 +277,11 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, 
unsigned int

nf_nat_setup_info(struct nf_conn *ct,

		  const struct nf_nat_range *range,

		  unsigned int hooknum)

		  enum nf_nat_manip_type maniptype)

{

	struct nf_conntrack_tuple curr_tuple, new_tuple;

	struct nf_conn_nat *nat;

	int have_to_hash = !(ct->status & IPS_NAT_DONE_MASK);

	enum nf_nat_manip_type maniptype = HOOK2MANIP(hooknum);



	/* nat helper or nfctnetlink also setup binding */

	nat = nfct_nat(ct);
@@ -294,10 +293,8 @@ nf_nat_setup_info(struct nf_conn *ct, 
		}

	}



	NF_CT_ASSERT(hooknum == NF_INET_PRE_ROUTING ||

		     hooknum == NF_INET_POST_ROUTING ||

		     hooknum == NF_INET_LOCAL_IN ||

		     hooknum == NF_INET_LOCAL_OUT);

	NF_CT_ASSERT(maniptype == IP_NAT_MANIP_SRC ||

		     maniptype == IP_NAT_MANIP_DST);

	BUG_ON(nf_nat_initialized(ct, maniptype));



	/* What we've got will look like inverse of reply. Normally