]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
netfilter: nf_nat: support IPv6 in IRC NAT helper
authorPablo Neira Ayuso <pablo@netfilter.org>
Sun, 26 Aug 2012 17:14:27 +0000 (19:14 +0200)
committerPablo Neira Ayuso <pablo@netfilter.org>
Thu, 30 Aug 2012 01:00:23 +0000 (03:00 +0200)
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>
net/ipv4/netfilter/Kconfig
net/ipv4/netfilter/Makefile
net/ipv4/netfilter/nf_nat_irc.c [deleted file]
net/netfilter/Kconfig
net/netfilter/Makefile
net/netfilter/nf_conntrack_irc.c
net/netfilter/nf_nat_irc.c [new file with mode: 0644]

index 30197f8003be1238766dca56c6a148d64e70714e..843fe17db20d8006753ddc71712f41ff985b961d 100644 (file)
@@ -221,11 +221,6 @@ config NF_NAT_PROTO_GRE
        tristate
        depends on NF_NAT_IPV4 && NF_CT_PROTO_GRE
 
-config NF_NAT_IRC
-       tristate
-       depends on NF_CONNTRACK && NF_NAT_IPV4
-       default NF_NAT_IPV4 && NF_CONNTRACK_IRC
-
 config NF_NAT_TFTP
        tristate
        depends on NF_CONNTRACK && NF_NAT_IPV4
index 8914abffc96ddad6fb9e3bcbba73b0cc2f960396..17e649bb98baf0ff433e7fc79f551556089045ec 100644 (file)
@@ -21,7 +21,6 @@ obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o
 
 # NAT helpers (nf_conntrack)
 obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o
-obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
 obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
 obj-$(CONFIG_NF_NAT_SNMP_BASIC) += nf_nat_snmp_basic.o
 obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o
diff --git a/net/ipv4/netfilter/nf_nat_irc.c b/net/ipv4/netfilter/nf_nat_irc.c
deleted file mode 100644 (file)
index 1ce37f8..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-/* IRC extension for TCP NAT alteration.
- *
- * (C) 2000-2001 by Harald Welte <laforge@gnumonks.org>
- * (C) 2004 Rusty Russell <rusty@rustcorp.com.au> IBM Corporation
- * based on a copy of RR's ip_nat_ftp.c
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/tcp.h>
-#include <linux/kernel.h>
-
-#include <net/netfilter/nf_nat.h>
-#include <net/netfilter/nf_nat_helper.h>
-#include <net/netfilter/nf_conntrack_helper.h>
-#include <net/netfilter/nf_conntrack_expect.h>
-#include <linux/netfilter/nf_conntrack_irc.h>
-
-MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
-MODULE_DESCRIPTION("IRC (DCC) NAT helper");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("ip_nat_irc");
-
-static unsigned int help(struct sk_buff *skb,
-                        enum ip_conntrack_info ctinfo,
-                        unsigned int protoff,
-                        unsigned int matchoff,
-                        unsigned int matchlen,
-                        struct nf_conntrack_expect *exp)
-{
-       char buffer[sizeof("4294967296 65635")];
-       u_int32_t ip;
-       u_int16_t port;
-       unsigned int ret;
-
-       /* Reply comes from server. */
-       exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;
-       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);
-               if (ret == 0)
-                       break;
-               else if (ret != -EBUSY) {
-                       port = 0;
-                       break;
-               }
-       }
-
-       if (port == 0)
-               return NF_DROP;
-
-       ip = ntohl(exp->master->tuplehash[IP_CT_DIR_REPLY].tuple.dst.u3.ip);
-       sprintf(buffer, "%u %u", ip, port);
-       pr_debug("nf_nat_irc: inserting '%s' == %pI4, port %u\n",
-                buffer, &ip, port);
-
-       ret = nf_nat_mangle_tcp_packet(skb, exp->master, ctinfo,
-                                      protoff, matchoff, matchlen, buffer,
-                                      strlen(buffer));
-       if (ret != NF_ACCEPT)
-               nf_ct_unexpect_related(exp);
-       return ret;
-}
-
-static void __exit nf_nat_irc_fini(void)
-{
-       RCU_INIT_POINTER(nf_nat_irc_hook, NULL);
-       synchronize_rcu();
-}
-
-static int __init nf_nat_irc_init(void)
-{
-       BUG_ON(nf_nat_irc_hook != NULL);
-       RCU_INIT_POINTER(nf_nat_irc_hook, help);
-       return 0;
-}
-
-/* Prior to 2.6.11, we had a ports param.  No longer, but don't break users. */
-static int warn_set(const char *val, struct kernel_param *kp)
-{
-       printk(KERN_INFO KBUILD_MODNAME
-              ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
-       return 0;
-}
-module_param_call(ports, warn_set, NULL, NULL, 0);
-
-module_init(nf_nat_irc_init);
-module_exit(nf_nat_irc_fini);
index bf3e4649efb23e5ea5da8fa66cab8460bb5b67ec..cabe4da0e191a6993a57711ed091a10d0918ac14 100644 (file)
@@ -390,6 +390,11 @@ config NF_NAT_FTP
        depends on NF_CONNTRACK && NF_NAT
        default NF_NAT && NF_CONNTRACK_FTP
 
+config NF_NAT_IRC
+       tristate
+       depends on NF_CONNTRACK && NF_NAT
+       default NF_NAT && NF_CONNTRACK_IRC
+
 config NF_NAT_SIP
        tristate
        depends on NF_CONNTRACK && NF_NAT
index 7d6d1a035f3149ed70e4c0edcdbcdef4ffcf73e5..0dd792972cae53d29a914dad82485e1ba650a060 100644 (file)
@@ -57,6 +57,7 @@ obj-$(CONFIG_NF_NAT_PROTO_SCTP) += nf_nat_proto_sctp.o
 # NAT helpers
 obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o
 obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o
+obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o
 obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o
 
 # transparent proxy support
index 95d097cdb202bc3f6b94d6023e3ade8706d583a5..3b20aa77cfc8b76ef1ed78b0b85aacd926f3ce29 100644 (file)
@@ -205,8 +205,7 @@ static int help(struct sk_buff *skb, unsigned int protoff,
                                          IPPROTO_TCP, NULL, &port);
 
                        nf_nat_irc = rcu_dereference(nf_nat_irc_hook);
-                       if (nf_nat_irc && nf_ct_l3num(ct) == NFPROTO_IPV4 &&
-                           ct->status & IPS_NAT_MASK)
+                       if (nf_nat_irc && ct->status & IPS_NAT_MASK)
                                ret = nf_nat_irc(skb, ctinfo, protoff,
                                                 addr_beg_p - ib_ptr,
                                                 addr_end_p - addr_beg_p,
diff --git a/net/netfilter/nf_nat_irc.c b/net/netfilter/nf_nat_irc.c
new file mode 100644 (file)
index 0000000..1fedee6
--- /dev/null
@@ -0,0 +1,93 @@
+/* IRC extension for TCP NAT alteration.
+ *
+ * (C) 2000-2001 by Harald Welte <laforge@gnumonks.org>
+ * (C) 2004 Rusty Russell <rusty@rustcorp.com.au> IBM Corporation
+ * based on a copy of RR's ip_nat_ftp.c
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/tcp.h>
+#include <linux/kernel.h>
+
+#include <net/netfilter/nf_nat.h>
+#include <net/netfilter/nf_nat_helper.h>
+#include <net/netfilter/nf_conntrack_helper.h>
+#include <net/netfilter/nf_conntrack_expect.h>
+#include <linux/netfilter/nf_conntrack_irc.h>
+
+MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
+MODULE_DESCRIPTION("IRC (DCC) NAT helper");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ip_nat_irc");
+
+static unsigned int help(struct sk_buff *skb,
+                        enum ip_conntrack_info ctinfo,
+                        unsigned int protoff,
+                        unsigned int matchoff,
+                        unsigned int matchlen,
+                        struct nf_conntrack_expect *exp)
+{
+       char buffer[sizeof("4294967296 65635")];
+       u_int16_t port;
+       unsigned int ret;
+
+       /* Reply comes from server. */
+       exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;
+       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);
+               if (ret == 0)
+                       break;
+               else if (ret != -EBUSY) {
+                       port = 0;
+                       break;
+               }
+       }
+
+       if (port == 0)
+               return NF_DROP;
+
+       ret = nf_nat_mangle_tcp_packet(skb, exp->master, ctinfo,
+                                      protoff, matchoff, matchlen, buffer,
+                                      strlen(buffer));
+       if (ret != NF_ACCEPT)
+               nf_ct_unexpect_related(exp);
+       return ret;
+}
+
+static void __exit nf_nat_irc_fini(void)
+{
+       RCU_INIT_POINTER(nf_nat_irc_hook, NULL);
+       synchronize_rcu();
+}
+
+static int __init nf_nat_irc_init(void)
+{
+       BUG_ON(nf_nat_irc_hook != NULL);
+       RCU_INIT_POINTER(nf_nat_irc_hook, help);
+       return 0;
+}
+
+/* Prior to 2.6.11, we had a ports param.  No longer, but don't break users. */
+static int warn_set(const char *val, struct kernel_param *kp)
+{
+       printk(KERN_INFO KBUILD_MODNAME
+              ": kernel >= 2.6.10 only uses 'ports' for conntrack modules\n");
+       return 0;
+}
+module_param_call(ports, warn_set, NULL, NULL, 0);
+
+module_init(nf_nat_irc_init);
+module_exit(nf_nat_irc_fini);