netfilter: nf_nat: support IPv6 in amanda NAT helper

Signed-off-by: Patrick McHardy <kaber@trash.net>

diff --git a/net/ipv4/netfilter/Kconfig b/net/ipv4/netfilter/Kconfig
index 8c6c6920b57ae39b96697bbf5aa06505f157944c..52c4a87007aabf819db6d36b1191474d34a4def9 100644 (file)
--- a/net/ipv4/netfilter/Kconfig
+++ b/net/ipv4/netfilter/Kconfig
@@ -231,11 +231,6 @@ config NF_NAT_TFTP
        depends on NF_CONNTRACK && NF_NAT_IPV4
        default NF_NAT_IPV4 && NF_CONNTRACK_TFTP
 
-config NF_NAT_AMANDA
-       tristate
-       depends on NF_CONNTRACK && NF_NAT_IPV4
-       default NF_NAT_IPV4 && NF_CONNTRACK_AMANDA
-
 config NF_NAT_PPTP
        tristate
        depends on NF_CONNTRACK && NF_NAT_IPV4

diff --git a/net/ipv4/netfilter/Makefile b/net/ipv4/netfilter/Makefile
index 4d8a4ad7816e98b57a1c6c6ad79dc2eaf83a1f6f..8baa496f6a4e86cb31c2bc96820bbcc00399aa3c 100644 (file)
--- a/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@ -20,7 +20,6 @@ obj-$(CONFIG_NF_NAT_IPV4) += nf_nat_ipv4.o
 obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o
 
 # NAT helpers (nf_conntrack)
-obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o
 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

diff --git a/net/ipv4/netfilter/nf_nat_amanda.c b/net/ipv4/netfilter/nf_nat_amanda.c
deleted file mode 100644 (file)
index 42d3378..0000000
--- a/net/ipv4/netfilter/nf_nat_amanda.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/* Amanda extension for TCP NAT alteration.
- * (C) 2002 by Brian J. Murrell <netfilter@interlinx.bc.ca>
- * based on a copy of HW's ip_nat_irc.c as well as other modules
- *
- * 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/kernel.h>
-#include <linux/module.h>
-#include <linux/skbuff.h>
-#include <linux/udp.h>
-
-#include <net/netfilter/nf_conntrack_helper.h>
-#include <net/netfilter/nf_conntrack_expect.h>
-#include <net/netfilter/nf_nat_helper.h>
-#include <linux/netfilter/nf_conntrack_amanda.h>
-
-MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
-MODULE_DESCRIPTION("Amanda NAT helper");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("ip_nat_amanda");
-
-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("65535")];
-       u_int16_t port;
-       unsigned int ret;
-
-       /* Connection comes from client. */
-       exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;
-       exp->dir = IP_CT_DIR_ORIGINAL;
-
-       /* When you see the packet, we need to NAT it the same as the
-        * this one (ie. same IP: it will be TCP and master is UDP). */
-       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);
-               if (res == 0)
-                       break;
-               else if (res != -EBUSY) {
-                       port = 0;
-                       break;
-               }
-       }
-
-       if (port == 0)
-               return NF_DROP;
-
-       sprintf(buffer, "%u", port);
-       ret = nf_nat_mangle_udp_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_amanda_fini(void)
-{
-       RCU_INIT_POINTER(nf_nat_amanda_hook, NULL);
-       synchronize_rcu();
-}
-
-static int __init nf_nat_amanda_init(void)
-{
-       BUG_ON(nf_nat_amanda_hook != NULL);
-       RCU_INIT_POINTER(nf_nat_amanda_hook, help);
-       return 0;
-}
-
-module_init(nf_nat_amanda_init);
-module_exit(nf_nat_amanda_fini);

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 310449450634e1a898179235ff2181f1aab3dac2..2eee9f1f99ef0a45365e3bade037eebcef784f2e 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -380,6 +380,11 @@ config NF_NAT_PROTO_SCTP
        depends on NF_NAT && NF_CT_PROTO_SCTP
        select LIBCRC32C
 
+config NF_NAT_AMANDA
+       tristate
+       depends on NF_CONNTRACK && NF_NAT
+       default NF_NAT && NF_CONNTRACK_AMANDA
+
 config NF_NAT_FTP
        tristate
        depends on NF_CONNTRACK && NF_NAT

diff --git a/net/netfilter/Makefile b/net/netfilter/Makefile
index 16592b1e5344d193f85cc4d5ad8fb7b23f39614e..7d6e1ea14c9b2e0124c6d657f28815600122ab75 100644 (file)
--- a/net/netfilter/Makefile
+++ b/net/netfilter/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_NF_NAT_PROTO_UDPLITE) += nf_nat_proto_udplite.o
 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
 
 # transparent proxy support

diff --git a/net/netfilter/nf_conntrack_amanda.c b/net/netfilter/nf_conntrack_amanda.c
index e0212b5494b13cc8546b6cd6357593e91f4a9a06..c514fe6033d254280f6760a3fe6d1c1f37185e1c 100644 (file)
--- a/net/netfilter/nf_conntrack_amanda.c
+++ b/net/netfilter/nf_conntrack_amanda.c
@@ -155,8 +155,7 @@ static int amanda_help(struct sk_buff *skb,
                                  IPPROTO_TCP, NULL, &port);
 
                nf_nat_amanda = rcu_dereference(nf_nat_amanda_hook);
-               if (nf_nat_amanda && nf_ct_l3num(ct) == NFPROTO_IPV4 &&
-                   ct->status & IPS_NAT_MASK)
+               if (nf_nat_amanda && ct->status & IPS_NAT_MASK)
                        ret = nf_nat_amanda(skb, ctinfo, protoff,
                                            off - dataoff, len, exp);
                else if (nf_ct_expect_related(exp) != 0)

diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c
new file mode 100644 (file)
index 0000000..42d3378
--- /dev/null
+++ b/net/netfilter/nf_nat_amanda.c
@@ -0,0 +1,85 @@
+/* Amanda extension for TCP NAT alteration.
+ * (C) 2002 by Brian J. Murrell <netfilter@interlinx.bc.ca>
+ * based on a copy of HW's ip_nat_irc.c as well as other modules
+ *
+ * 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/kernel.h>
+#include <linux/module.h>
+#include <linux/skbuff.h>
+#include <linux/udp.h>
+
+#include <net/netfilter/nf_conntrack_helper.h>
+#include <net/netfilter/nf_conntrack_expect.h>
+#include <net/netfilter/nf_nat_helper.h>
+#include <linux/netfilter/nf_conntrack_amanda.h>
+
+MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");
+MODULE_DESCRIPTION("Amanda NAT helper");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("ip_nat_amanda");
+
+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("65535")];
+       u_int16_t port;
+       unsigned int ret;
+
+       /* Connection comes from client. */
+       exp->saved_proto.tcp.port = exp->tuple.dst.u.tcp.port;
+       exp->dir = IP_CT_DIR_ORIGINAL;
+
+       /* When you see the packet, we need to NAT it the same as the
+        * this one (ie. same IP: it will be TCP and master is UDP). */
+       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);
+               if (res == 0)
+                       break;
+               else if (res != -EBUSY) {
+                       port = 0;
+                       break;
+               }
+       }
+
+       if (port == 0)
+               return NF_DROP;
+
+       sprintf(buffer, "%u", port);
+       ret = nf_nat_mangle_udp_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_amanda_fini(void)
+{
+       RCU_INIT_POINTER(nf_nat_amanda_hook, NULL);
+       synchronize_rcu();
+}
+
+static int __init nf_nat_amanda_init(void)
+{
+       BUG_ON(nf_nat_amanda_hook != NULL);
+       RCU_INIT_POINTER(nf_nat_amanda_hook, help);
+       return 0;
+}
+
+module_init(nf_nat_amanda_init);
+module_exit(nf_nat_amanda_fini);