Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee6eb966 authored by Patrick McHardy's avatar Patrick McHardy Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: support IPv6 in amanda NAT helper 



Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent d33cbeeb

net/ipv4/netfilter/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -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

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

net/netfilter/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -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

net/netfilter/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -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

net/netfilter/nf_conntrack_amanda.c

+1 −2
Original line number Diff line number Diff line
@@ -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)