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

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

netfilter: nf_nat: make unique_tuple return void 



The only user of unique_tuple() get_unique_tuple() doesn't care about the
return value of unique_tuple(), so make unique_tuple() return void (nothing).

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

include/net/netfilter/nf_nat_protocol.h

+4 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ struct nf_nat_protocol { 


	/* Alter the per-proto part of the tuple (depending on

	   maniptype), to give a unique tuple in the given range if

	   possible; return false if not.  Per-protocol part of tuple

	   is initialized to the incoming packet. */

	bool (*unique_tuple)(struct nf_conntrack_tuple *tuple,

	   possible.  Per-protocol part of tuple is initialized to the

	   incoming packet. */

	void (*unique_tuple)(struct nf_conntrack_tuple *tuple,

			     const struct nf_nat_range *range,

			     enum nf_nat_manip_type maniptype,

			     const struct nf_conn *ct);
@@ -63,7 +63,7 @@ extern bool nf_nat_proto_in_range(const struct nf_conntrack_tuple *tuple, 
				  const union nf_conntrack_man_proto *min,

				  const union nf_conntrack_man_proto *max);



extern bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,

extern void nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,

				      const struct nf_nat_range *range,

				      enum nf_nat_manip_type maniptype,

				      const struct nf_conn *ct,

net/ipv4/netfilter/nf_nat_proto_common.c

+4 −4
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ bool nf_nat_proto_in_range(const struct nf_conntrack_tuple *tuple, 
}

EXPORT_SYMBOL_GPL(nf_nat_proto_in_range);



bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,

void nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple,

			       const struct nf_nat_range *range,

			       enum nf_nat_manip_type maniptype,

			       const struct nf_conn *ct,
@@ -53,7 +53,7 @@ bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple, 
	if (!(range->flags & IP_NAT_RANGE_PROTO_SPECIFIED)) {

		/* If it's dst rewrite, can't change port */

		if (maniptype == IP_NAT_MANIP_DST)

			return false;

			return;



		if (ntohs(*portptr) < 1024) {

			/* Loose convention: >> 512 is credential passing */
@@ -87,9 +87,9 @@ bool nf_nat_proto_unique_tuple(struct nf_conntrack_tuple *tuple, 
			continue;

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

			*rover = off;

		return true;

		return;

	}

	return false;

	return;

}

EXPORT_SYMBOL_GPL(nf_nat_proto_unique_tuple);

net/ipv4/netfilter/nf_nat_proto_dccp.c

+3 −3
Original line number Diff line number Diff line
@@ -22,13 +22,13 @@ 


static u_int16_t dccp_port_rover;



static bool

static void

dccp_unique_tuple(struct nf_conntrack_tuple *tuple,

		  const struct nf_nat_range *range,

		  enum nf_nat_manip_type maniptype,

		  const struct nf_conn *ct)

{

	return nf_nat_proto_unique_tuple(tuple, range, maniptype, ct,

	nf_nat_proto_unique_tuple(tuple, range, maniptype, ct,

				  &dccp_port_rover);

}

net/ipv4/netfilter/nf_nat_proto_gre.c

+4 −4
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); 
MODULE_DESCRIPTION("Netfilter NAT protocol helper module for GRE");



/* generate unique tuple ... */

static bool

static void

gre_unique_tuple(struct nf_conntrack_tuple *tuple,

		 const struct nf_nat_range *range,

		 enum nf_nat_manip_type maniptype,
@@ -50,7 +50,7 @@ gre_unique_tuple(struct nf_conntrack_tuple *tuple, 
	/* If there is no master conntrack we are not PPTP,

	   do not change tuples */

	if (!ct->master)

		return false;

		return;



	if (maniptype == IP_NAT_MANIP_SRC)

		keyptr = &tuple->src.u.gre.key;
@@ -71,11 +71,11 @@ gre_unique_tuple(struct nf_conntrack_tuple *tuple, 
	for (i = 0; i < range_size; i++, key++) {

		*keyptr = htons(min + key % range_size);

		if (!nf_nat_used_tuple(tuple, ct))

			return true;

			return;

	}



	pr_debug("%p: no NAT mapping\n", ct);

	return false;

	return;

}



/* manipulate a GRE packet according to maniptype */

net/ipv4/netfilter/nf_nat_proto_icmp.c

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ icmp_in_range(const struct nf_conntrack_tuple *tuple, 
	       ntohs(tuple->src.u.icmp.id) <= ntohs(max->icmp.id);

}



static bool

static void

icmp_unique_tuple(struct nf_conntrack_tuple *tuple,

		  const struct nf_nat_range *range,

		  enum nf_nat_manip_type maniptype,
@@ -46,9 +46,9 @@ icmp_unique_tuple(struct nf_conntrack_tuple *tuple, 
		tuple->src.u.icmp.id = htons(ntohs(range->min.icmp.id) +

					     (id % range_size));

		if (!nf_nat_used_tuple(tuple, ct))

			return true;

			return;

	}

	return false;

	return;

}



static bool