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

Commit 99ad3c53 authored by Changli Gao's avatar Changli Gao Committed by Patrick McHardy
Browse files

netfilter: nf_nat_core: don't check if the tuple is used if there is no other choice 



Eliminate nf_nat_used_tuple() to save some CPU cycles when there is no
other choice.

Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 70a85166

net/ipv4/netfilter/nf_nat_core.c

+11 −5
Original line number Diff line number Diff line
@@ -262,11 +262,17 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, 
	proto = __nf_nat_proto_find(orig_tuple->dst.protonum);



	/* Only bother mapping if it's not already in range and unique */

	if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM) &&

	    (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) ||

	     proto->in_range(tuple, maniptype, &range->min, &range->max)) &&

	    !nf_nat_used_tuple(tuple, ct))

	if (!(range->flags & IP_NAT_RANGE_PROTO_RANDOM)) {

		if (range->flags & IP_NAT_RANGE_PROTO_SPECIFIED) {

			if (proto->in_range(tuple, maniptype, &range->min,

					    &range->max) &&

			    (range->min.all == range->max.all ||

			     !nf_nat_used_tuple(tuple, ct)))

				goto out;

		} else if (!nf_nat_used_tuple(tuple, ct)) {

			goto out;

		}

	}



	/* Last change: get protocol to try to obtain unique tuple. */

	proto->unique_tuple(tuple, range, maniptype, ct);