tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

netfilter: nf_nat: support IPv6 in amanda NAT helper

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

authored by

Patrick McHardy and committed by
Pablo Neira Ayuso ee6eb966 d33cbeeb

+7 -8
-5
net/ipv4/netfilter/Kconfig
··· 231 231 depends on NF_CONNTRACK && NF_NAT_IPV4 232 232 default NF_NAT_IPV4 && NF_CONNTRACK_TFTP 233 233 234 - config NF_NAT_AMANDA 235 - tristate 236 - depends on NF_CONNTRACK && NF_NAT_IPV4 237 - default NF_NAT_IPV4 && NF_CONNTRACK_AMANDA 238 - 239 234 config NF_NAT_PPTP 240 235 tristate 241 236 depends on NF_CONNTRACK && NF_NAT_IPV4
-1
net/ipv4/netfilter/Makefile
··· 20 20 obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o 21 21 22 22 # NAT helpers (nf_conntrack) 23 - obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o 24 23 obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.o 25 24 obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o 26 25 obj-$(CONFIG_NF_NAT_PPTP) += nf_nat_pptp.o
net/ipv4/netfilter/nf_nat_amanda.c net/netfilter/nf_nat_amanda.c
+5
net/netfilter/Kconfig
··· 380 380 depends on NF_NAT && NF_CT_PROTO_SCTP 381 381 select LIBCRC32C 382 382 383 + config NF_NAT_AMANDA 384 + tristate 385 + depends on NF_CONNTRACK && NF_NAT 386 + default NF_NAT && NF_CONNTRACK_AMANDA 387 + 383 388 config NF_NAT_FTP 384 389 tristate 385 390 depends on NF_CONNTRACK && NF_NAT
+1
net/netfilter/Makefile
··· 55 55 obj-$(CONFIG_NF_NAT_PROTO_SCTP) += nf_nat_proto_sctp.o 56 56 57 57 # NAT helpers 58 + obj-$(CONFIG_NF_NAT_AMANDA) += nf_nat_amanda.o 58 59 obj-$(CONFIG_NF_NAT_FTP) += nf_nat_ftp.o 59 60 60 61 # transparent proxy support
+1 -2
net/netfilter/nf_conntrack_amanda.c
··· 155 155 IPPROTO_TCP, NULL, &port); 156 156 157 157 nf_nat_amanda = rcu_dereference(nf_nat_amanda_hook); 158 - if (nf_nat_amanda && nf_ct_l3num(ct) == NFPROTO_IPV4 && 159 - ct->status & IPS_NAT_MASK) 158 + if (nf_nat_amanda && ct->status & IPS_NAT_MASK) 160 159 ret = nf_nat_amanda(skb, ctinfo, protoff, 161 160 off - dataoff, len, exp); 162 161 else if (nf_ct_expect_related(exp) != 0)