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

Commit 320ff567 authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_nat: support IPv6 in TFTP NAT helper 



Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 5901b6be

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_TFTP

	tristate

	depends on NF_CONNTRACK && NF_NAT_IPV4

	default NF_NAT_IPV4 && NF_CONNTRACK_TFTP



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
@@ -23,7 +23,6 @@ obj-$(CONFIG_NF_DEFRAG_IPV4) += nf_defrag_ipv4.o 
obj-$(CONFIG_NF_NAT_H323) += nf_nat_h323.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



# NAT protocols (nf_nat)

obj-$(CONFIG_NF_NAT_PROTO_GRE) += nf_nat_proto_gre.o

net/netfilter/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -400,6 +400,11 @@ config NF_NAT_SIP 
	depends on NF_CONNTRACK && NF_NAT

	default NF_NAT && NF_CONNTRACK_SIP



config NF_NAT_TFTP

	tristate

	depends on NF_CONNTRACK && NF_NAT

	default NF_NAT && NF_CONNTRACK_TFTP



endif # NF_CONNTRACK



# transparent proxy support

net/netfilter/Makefile

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

obj-$(CONFIG_NF_NAT_TFTP) += nf_nat_tftp.o



# transparent proxy support

obj-$(CONFIG_NETFILTER_TPROXY) += nf_tproxy_core.o

net/netfilter/nf_conntrack_tftp.c

+1 −2
Original line number Diff line number Diff line
@@ -72,8 +72,7 @@ static int tftp_help(struct sk_buff *skb, 
		nf_ct_dump_tuple(&exp->tuple);



		nf_nat_tftp = rcu_dereference(nf_nat_tftp_hook);

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

		    ct->status & IPS_NAT_MASK)

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

			ret = nf_nat_tftp(skb, ctinfo, exp);

		else if (nf_ct_expect_related(exp) != 0)

			ret = NF_DROP;