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

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

netfilter: nf_nat_core: merge the same lines 



proto->unique_tuple() will be called finally, if the previous calls fail. This
patch checks the false condition of (range->flags &IP_NAT_RANGE_PROTO_RANDOM)
instead to avoid duplicate line of code: proto->unique_tuple().

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

net/ipv4/netfilter/nf_nat_core.c

+2 −7
Original line number Diff line number Diff line
@@ -261,14 +261,9 @@ get_unique_tuple(struct nf_conntrack_tuple *tuple, 
	rcu_read_lock();

	proto = __nf_nat_proto_find(orig_tuple->dst.protonum);



	/* Change protocol info to have some randomization */

	if (range->flags & IP_NAT_RANGE_PROTO_RANDOM) {

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

		goto out;

	}



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

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

	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))

		goto out;