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

Commit ff459018 authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: masquerade: attach nat extension if not present 



Currently the nat extension is always attached as soon as nat module is
loaded.  However, most NAT uses do not need the nat extension anymore.

Prepare to remove the add-nat-by-default by making those places that need
it attach it if its not present yet.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 22d4536d

net/ipv4/netfilter/nf_nat_masquerade_ipv4.c

+3 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum, 
	NF_CT_ASSERT(hooknum == NF_INET_POST_ROUTING);



	ct = nf_ct_get(skb, &ctinfo);

	nat = nfct_nat(ct);



	NF_CT_ASSERT(ct && (ctinfo == IP_CT_NEW || ctinfo == IP_CT_RELATED ||

			    ctinfo == IP_CT_RELATED_REPLY));
@@ -56,6 +55,8 @@ nf_nat_masquerade_ipv4(struct sk_buff *skb, unsigned int hooknum, 
		return NF_DROP;

	}



	nat = nf_ct_nat_ext_add(ct);

	if (nat)

		nat->masq_index = out->ifindex;



	/* Transfer from original range. */

net/ipv6/netfilter/nf_nat_masquerade_ipv6.c

+4 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range *range, 
		       const struct net_device *out)

{

	enum ip_conntrack_info ctinfo;

	struct nf_conn_nat *nat;

	struct in6_addr src;

	struct nf_conn *ct;

	struct nf_nat_range newrange;
@@ -42,7 +43,9 @@ nf_nat_masquerade_ipv6(struct sk_buff *skb, const struct nf_nat_range *range, 
			       &ipv6_hdr(skb)->daddr, 0, &src) < 0)

		return NF_DROP;



	nfct_nat(ct)->masq_index = out->ifindex;

	nat = nf_ct_nat_ext_add(ct);

	if (nat)

		nat->masq_index = out->ifindex;



	newrange.flags		= range->flags | NF_NAT_RANGE_MAP_IPS;

	newrange.min_addr.in6	= src;