[NETFILTER]: Fix confusing naming in NAT-helpers

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv4/netfilter/ip_nat_ftp.c b/net/ipv4/netfilter/ip_nat_ftp.c
index ae15f410bc4bafd5fd034e3bf64149bda914b204..db2f0860ce9ac8380bc2b65d605533ad42337b04 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_ftp.c
+++ b/net/ipv4/netfilter/ip_nat_ftp.c
@@ -178,7 +178,7 @@ static int (*mangle[])(struct sk_buff **, u_int32_t, u_int16_t,
     [IP_CT_FTP_EPSV] = mangle_epsv_packet
 };
 
-static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
+static int ftp_data_fixup(const struct ip_ct_ftp_expect *exp_ftp_info,
                          struct ip_conntrack *ct,
                          struct sk_buff **pskb,
                          enum ip_conntrack_info ctinfo,
@@ -192,13 +192,13 @@ static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
 
        MUST_BE_LOCKED(&ip_ftp_lock);
        DEBUGP("FTP_NAT: seq %u + %u in %u\n",
-              expect->seq, ct_ftp_info->len,
+              expect->seq, exp_ftp_info->len,
               ntohl(tcph->seq));
 
        /* Change address inside packet to match way we're mapping
           this connection. */
-       if (ct_ftp_info->ftptype == IP_CT_FTP_PASV
-           || ct_ftp_info->ftptype == IP_CT_FTP_EPSV) {
+       if (exp_ftp_info->ftptype == IP_CT_FTP_PASV
+           || exp_ftp_info->ftptype == IP_CT_FTP_EPSV) {
                /* PASV/EPSV response: must be where client thinks server
                   is */
                newip = ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.dst.ip;
@@ -220,7 +220,7 @@ static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
        newtuple.src.u.tcp.port = expect->tuple.src.u.tcp.port;
 
        /* Try to get same port: if not, try to change it. */
-       for (port = ct_ftp_info->port; port != 0; port++) {
+       for (port = exp_ftp_info->port; port != 0; port++) {
                newtuple.dst.u.tcp.port = htons(port);
 
                if (ip_conntrack_change_expect(expect, &newtuple) == 0)
@@ -229,9 +229,9 @@ static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
        if (port == 0)
                return 0;
 
-       if (!mangle[ct_ftp_info->ftptype](pskb, newip, port,
+       if (!mangle[exp_ftp_info->ftptype](pskb, newip, port,
                                          expect->seq - ntohl(tcph->seq),
-                                         ct_ftp_info->len, ct, ctinfo))
+                                         exp_ftp_info->len, ct, ctinfo))
                return 0;
 
        return 1;
@@ -248,12 +248,12 @@ static unsigned int help(struct ip_conntrack *ct,
        struct tcphdr *tcph = (void *)iph + iph->ihl*4;
        unsigned int datalen;
        int dir;
-       struct ip_ct_ftp_expect *ct_ftp_info;
+       struct ip_ct_ftp_expect *exp_ftp_info;
 
        if (!exp)
                DEBUGP("ip_nat_ftp: no exp!!");
 
-       ct_ftp_info = &exp->help.exp_ftp_info;
+       exp_ftp_info = &exp->help.exp_ftp_info;
 
        /* Only mangle things once: original direction in POST_ROUTING
           and reply direction on PRE_ROUTING. */
@@ -271,10 +271,10 @@ static unsigned int help(struct ip_conntrack *ct,
        datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4;
        LOCK_BH(&ip_ftp_lock);
        /* If it's in the right range... */
-       if (between(exp->seq + ct_ftp_info->len,
+       if (between(exp->seq + exp_ftp_info->len,
                    ntohl(tcph->seq),
                    ntohl(tcph->seq) + datalen)) {
-               if (!ftp_data_fixup(ct_ftp_info, ct, pskb, ctinfo, exp)) {
+               if (!ftp_data_fixup(exp_ftp_info, ct, pskb, ctinfo, exp)) {
                        UNLOCK_BH(&ip_ftp_lock);
                        return NF_DROP;
                }
@@ -283,7 +283,7 @@ static unsigned int help(struct ip_conntrack *ct,
                   It's a cracker being funky. */
                if (net_ratelimit()) {
                        printk("FTP_NAT: partial packet %u/%u in %u/%u\n",
-                              exp->seq, ct_ftp_info->len,
+                              exp->seq, exp_ftp_info->len,
                               ntohl(tcph->seq),
                               ntohl(tcph->seq) + datalen);
                }

diff --git a/net/ipv4/netfilter/ip_nat_irc.c b/net/ipv4/netfilter/ip_nat_irc.c
index 06555b44e49b48807aaaca182a1851ac420b076e..6edc72c0c0be485085bcf1c8299a4c570091400c 100644 (file)
--- a/net/ipv4/netfilter/ip_nat_irc.c
+++ b/net/ipv4/netfilter/ip_nat_irc.c
@@ -88,7 +88,7 @@ irc_nat_expected(struct sk_buff **pskb,
        return ip_nat_setup_info(ct, &mr, hooknum);
 }
 
-static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info,
+static int irc_data_fixup(const struct ip_ct_irc_expect *exp_irc_info,
                          struct ip_conntrack *ct,
                          struct sk_buff **pskb,
                          enum ip_conntrack_info ctinfo,
@@ -106,7 +106,7 @@ static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info,
        MUST_BE_LOCKED(&ip_irc_lock);
 
        DEBUGP("IRC_NAT: info (seq %u + %u) in %u\n",
-              expect->seq, ct_irc_info->len,
+              expect->seq, exp_irc_info->len,
               ntohl(tcph->seq));
 
        newip = ct->tuplehash[IP_CT_DIR_REPLY].tuple.dst.ip;
@@ -119,7 +119,7 @@ static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info,
 
        t = expect->tuple;
        t.dst.ip = newip;
-       for (port = ct_irc_info->port; port != 0; port++) {
+       for (port = exp_irc_info->port; port != 0; port++) {
                t.dst.u.tcp.port = htons(port);
                if (ip_conntrack_change_expect(expect, &t) == 0) {
                        DEBUGP("using port %d", port);
@@ -149,7 +149,7 @@ static int irc_data_fixup(const struct ip_ct_irc_expect *ct_irc_info,
 
        return ip_nat_mangle_tcp_packet(pskb, ct, ctinfo, 
                                        expect->seq - ntohl(tcph->seq),
-                                       ct_irc_info->len, buffer, 
+                                       exp_irc_info->len, buffer, 
                                        strlen(buffer));
 }
 
@@ -164,12 +164,12 @@ static unsigned int help(struct ip_conntrack *ct,
        struct tcphdr *tcph = (void *) iph + iph->ihl * 4;
        unsigned int datalen;
        int dir;
-       struct ip_ct_irc_expect *ct_irc_info;
+       struct ip_ct_irc_expect *exp_irc_info;
 
        if (!exp)
                DEBUGP("ip_nat_irc: no exp!!");
                
-       ct_irc_info = &exp->help.exp_irc_info;
+       exp_irc_info = &exp->help.exp_irc_info;
 
        /* Only mangle things once: original direction in POST_ROUTING
           and reply direction on PRE_ROUTING. */
@@ -188,10 +188,10 @@ static unsigned int help(struct ip_conntrack *ct,
        datalen = (*pskb)->len - iph->ihl * 4 - tcph->doff * 4;
        LOCK_BH(&ip_irc_lock);
        /* Check whether the whole IP/address pattern is carried in the payload */
-       if (between(exp->seq + ct_irc_info->len,
+       if (between(exp->seq + exp_irc_info->len,
                    ntohl(tcph->seq),
                    ntohl(tcph->seq) + datalen)) {
-               if (!irc_data_fixup(ct_irc_info, ct, pskb, ctinfo, exp)) {
+               if (!irc_data_fixup(exp_irc_info, ct, pskb, ctinfo, exp)) {
                        UNLOCK_BH(&ip_irc_lock);
                        return NF_DROP;
                }
@@ -201,7 +201,7 @@ static unsigned int help(struct ip_conntrack *ct,
                if (net_ratelimit()) {
                        printk
                            ("IRC_NAT: partial packet %u/%u in %u/%u\n",
-                            exp->seq, ct_irc_info->len,
+                            exp->seq, exp_irc_info->len,
                             ntohl(tcph->seq),
                             ntohl(tcph->seq) + datalen);
                }