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

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

netfilter: nf_nat: support IPv6 in FTP NAT helper 



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

net/ipv4/netfilter/Kconfig

+0 −5
Original line number Diff line number Diff line
@@ -221,11 +221,6 @@ config NF_NAT_PROTO_GRE 
	tristate

	depends on NF_NAT_IPV4 && NF_CT_PROTO_GRE



config NF_NAT_FTP

	tristate

	depends on NF_CONNTRACK && NF_NAT_IPV4

	default NF_NAT_IPV4 && NF_CONNTRACK_FTP



config NF_NAT_IRC

	tristate

	depends on NF_CONNTRACK && NF_NAT_IPV4

net/ipv4/netfilter/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 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_FTP) += nf_nat_ftp.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_FTP

	tristate

	depends on NF_CONNTRACK && NF_NAT

	default NF_NAT && NF_CONNTRACK_FTP



endif # NF_CONNTRACK



# transparent proxy support

net/netfilter/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ obj-$(CONFIG_NF_NAT_PROTO_DCCP) += nf_nat_proto_dccp.o 
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_FTP) += nf_nat_ftp.o



# transparent proxy support

obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o

net/netfilter/nf_conntrack_ftp.c

+1 −2
Original line number Diff line number Diff line
@@ -488,8 +488,7 @@ static int help(struct sk_buff *skb, 
	/* Now, NAT might want to mangle the packet, and register the

	 * (possibly changed) expectation itself. */

	nf_nat_ftp = rcu_dereference(nf_nat_ftp_hook);

	if (nf_nat_ftp && nf_ct_l3num(ct) == NFPROTO_IPV4 &&

	    ct->status & IPS_NAT_MASK)

	if (nf_nat_ftp && ct->status & IPS_NAT_MASK)

		ret = nf_nat_ftp(skb, ctinfo, search[dir][i].ftptype,

				 protoff, matchoff, matchlen, exp);

	else {