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>

diff --git a/include/net/netfilter/nf_nat_helper.h b/include/net/netfilter/nf_nat_helper.h
index efae84646353ca272f4ef9f16382a2c82c939c0a..44c421b9be853a74a71baa58b3ccca9d83a96944 100644 (file)
--- a/include/net/netfilter/nf_nat_helper.h
+++ b/include/net/netfilter/nf_nat_helper.h
@@ -38,4 +38,5 @@ bool nf_nat_mangle_udp_packet(struct sk_buff *skb, struct nf_conn *ct,
  * to port ct->master->saved_proto. */
 void nf_nat_follow_master(struct nf_conn *ct, struct nf_conntrack_expect *this);
 
+u16 nf_nat_exp_find_port(struct nf_conntrack_expect *exp, u16 port);
 #endif

diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c
index a334f0dcc2d0dbd430f836266b822334d9cb8f00..faee20af485613132c874442fa3942018e3f3ecb 100644 (file)
--- a/net/ipv4/netfilter/nf_nat_h323.c
+++ b/net/ipv4/netfilter/nf_nat_h323.c
@@ -291,20 +291,7 @@ static int nat_t120(struct sk_buff *skb, struct nf_conn *ct,
        exp->expectfn = nf_nat_follow_master;
        exp->dir = !dir;
 
-       /* Try to get same port: if not, try to change it. */
-       for (; nated_port != 0; nated_port++) {
-               int ret;
-
-               exp->tuple.dst.u.tcp.port = htons(nated_port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       nated_port = 0;
-                       break;
-               }
-       }
-
+       nated_port = nf_nat_exp_find_port(exp, nated_port);
        if (nated_port == 0) {  /* No port available */
                net_notice_ratelimited("nf_nat_h323: out of TCP ports\n");
                return 0;
@@ -347,20 +334,7 @@ static int nat_h245(struct sk_buff *skb, struct nf_conn *ct,
        if (info->sig_port[dir] == port)
                nated_port = ntohs(info->sig_port[!dir]);
 
-       /* Try to get same port: if not, try to change it. */
-       for (; nated_port != 0; nated_port++) {
-               int ret;
-
-               exp->tuple.dst.u.tcp.port = htons(nated_port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       nated_port = 0;
-                       break;
-               }
-       }
-
+       nated_port = nf_nat_exp_find_port(exp, nated_port);
        if (nated_port == 0) {  /* No port available */
                net_notice_ratelimited("nf_nat_q931: out of TCP ports\n");
                return 0;
@@ -439,20 +413,7 @@ static int nat_q931(struct sk_buff *skb, struct nf_conn *ct,
        if (info->sig_port[dir] == port)
                nated_port = ntohs(info->sig_port[!dir]);
 
-       /* Try to get same port: if not, try to change it. */
-       for (; nated_port != 0; nated_port++) {
-               int ret;
-
-               exp->tuple.dst.u.tcp.port = htons(nated_port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       nated_port = 0;
-                       break;
-               }
-       }
-
+       nated_port = nf_nat_exp_find_port(exp, nated_port);
        if (nated_port == 0) {  /* No port available */
                net_notice_ratelimited("nf_nat_ras: out of TCP ports\n");
                return 0;
@@ -532,20 +493,7 @@ static int nat_callforwarding(struct sk_buff *skb, struct nf_conn *ct,
        exp->expectfn = ip_nat_callforwarding_expect;
        exp->dir = !dir;
 
-       /* Try to get same port: if not, try to change it. */
-       for (nated_port = ntohs(port); nated_port != 0; nated_port++) {
-               int ret;
-
-               exp->tuple.dst.u.tcp.port = htons(nated_port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       nated_port = 0;
-                       break;
-               }
-       }
-
+       nated_port = nf_nat_exp_find_port(exp, ntohs(port));
        if (nated_port == 0) {  /* No port available */
                net_notice_ratelimited("nf_nat_q931: out of TCP ports\n");
                return 0;

diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c
index 3bc7e0854efe4d0265f9e442bca10a140c65ab2a..98deef6cde694349b5f952620b8f5e654e9f5f30 100644 (file)
--- 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;

diff --git a/net/netfilter/nf_nat_ftp.c b/net/netfilter/nf_nat_ftp.c
index aace6768a64e716611f1c83925941d8ea20a9abf..c92a436d9c486e0c70afdb6bdef128c990b7a682 100644 (file)
--- a/net/netfilter/nf_nat_ftp.c
+++ b/net/netfilter/nf_nat_ftp.c
@@ -86,22 +86,9 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb,
         * this one. */
        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 ret;
-
-               exp->tuple.dst.u.tcp.port = htons(port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -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, ct, "all ports in use");
+               nf_ct_helper_log(skb, exp->master, "all ports in use");
                return NF_DROP;
        }
 

diff --git a/net/netfilter/nf_nat_helper.c b/net/netfilter/nf_nat_helper.c
index a263505455fcc15c39da3d01b6729afc1615e68e..067d6d6f6b7dc2bb6015ee50c6b79b33bd4ba7d1 100644 (file)
--- a/net/netfilter/nf_nat_helper.c
+++ b/net/netfilter/nf_nat_helper.c
@@ -198,3 +198,22 @@ void nf_nat_follow_master(struct nf_conn *ct,
        nf_nat_setup_info(ct, &range, NF_NAT_MANIP_DST);
 }
 EXPORT_SYMBOL(nf_nat_follow_master);
+
+u16 nf_nat_exp_find_port(struct nf_conntrack_expect *exp, u16 port)
+{
+       /* Try to get same port: if not, try to change it. */
+       for (; port != 0; port++) {
+               int res;
+
+               exp->tuple.dst.u.tcp.port = htons(port);
+               res = nf_ct_expect_related(exp, 0);
+               if (res == 0)
+                       return port;
+
+               if (res != -EBUSY)
+                       break;
+       }
+
+       return 0;
+}
+EXPORT_SYMBOL_GPL(nf_nat_exp_find_port);

diff --git a/net/netfilter/nf_nat_irc.c b/net/netfilter/nf_nat_irc.c
index c691ab8d234cf153e96081b6281ed86639e35021..19c4fcc60c50f22abceac840f294afb262034bb0 100644 (file)
--- a/net/netfilter/nf_nat_irc.c
+++ b/net/netfilter/nf_nat_irc.c
@@ -48,20 +48,8 @@ static unsigned int help(struct sk_buff *skb,
        exp->dir = IP_CT_DIR_REPLY;
        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 ret;
-
-               exp->tuple.dst.u.tcp.port = htons(port);
-               ret = nf_ct_expect_related(exp, 0);
-               if (ret == 0)
-                       break;
-               else if (ret != -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, ct, "all ports in use");
                return NF_DROP;

diff --git a/net/netfilter/nf_nat_sip.c b/net/netfilter/nf_nat_sip.c
index f0a735e868518f80ddcaf852432c96186053f961..cf4aeb299bdef2f481d91aeba7c7c173012ee353 100644 (file)
--- a/net/netfilter/nf_nat_sip.c
+++ b/net/netfilter/nf_nat_sip.c
@@ -410,19 +410,7 @@ static unsigned int nf_nat_sip_expect(struct sk_buff *skb, unsigned int protoff,
        exp->dir = !dir;
        exp->expectfn = nf_nat_sip_expected;
 
-       for (; port != 0; port++) {
-               int ret;
-
-               exp->tuple.dst.u.udp.port = htons(port);
-               ret = nf_ct_expect_related(exp, NF_CT_EXP_F_SKIP_MASTER);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       port = 0;
-                       break;
-               }
-       }
-
+       port = nf_nat_exp_find_port(exp, port);
        if (port == 0) {
                nf_ct_helper_log(skb, ct, "all ports in use for SIP");
                return NF_DROP;