summaryrefslogtreecommitdiff
path: root/net/netfilter/nf_nat_amanda.c
diff options
context:
space:
mode:
authorFlorian Westphal <fw@strlen.de>2022-09-06 17:20:35 +0200
committerFlorian Westphal <fw@strlen.de>2022-09-07 16:46:04 +0200
commitc92c27171040554cfda7a3fc925e9dbcb5b4a698 (patch)
tree59d7fc3e6dbecbee86cb99add3454a1f999f5047 /net/netfilter/nf_nat_amanda.c
parent8556bceb9c409946eebd2303d2f19e87844195ae (diff)
netfilter: nat: move repetitive nat port reserve loop to a helper
Almost all nat helpers reserve an expecation port the same way: Try the port inidcated by the peer, then move to next port if that port is already in use. We can squash this into a helper. Suggested-by: Pablo Neira Ayuso <pablo@netfilter.org> Signed-off-by: Florian Westphal <fw@strlen.de>
Diffstat (limited to 'net/netfilter/nf_nat_amanda.c')
-rw-r--r--net/netfilter/nf_nat_amanda.c14
1 files changed, 1 insertions, 13 deletions
diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c
index 3bc7e0854efe..98deef6cde69 100644
--- a/net/netfilter/nf_nat_amanda.c
+++ b/net/netfilter/nf_nat_amanda.c
@@ -44,19 +44,7 @@ static unsigned int help(struct sk_buff *skb,
exp->expectfn = nf_nat_follow_master;
/* Try to get same port: if not, try to change it. */
- for (port = ntohs(exp->saved_proto.tcp.port); port != 0; port++) {
- int res;
-
- exp->tuple.dst.u.tcp.port = htons(port);
- res = nf_ct_expect_related(exp, 0);
- if (res == 0)
- break;
- else if (res != -EBUSY) {
- port = 0;
- break;
- }
- }
-
+ port = nf_nat_exp_find_port(exp, ntohs(exp->saved_proto.tcp.port));
if (port == 0) {
nf_ct_helper_log(skb, exp->master, "all ports in use");
return NF_DROP;