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

Commit 5901b6be authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nf_nat: support IPv6 in IRC NAT helper 



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

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_IRC

	tristate

	depends on NF_CONNTRACK && NF_NAT_IPV4

	default NF_NAT_IPV4 && NF_CONNTRACK_IRC



config NF_NAT_TFTP

	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_H323) += nf_nat_h323.o

obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.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

net/netfilter/Kconfig

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

	default NF_NAT && NF_CONNTRACK_FTP



config NF_NAT_IRC

	tristate

	depends on NF_CONNTRACK && NF_NAT

	default NF_NAT && NF_CONNTRACK_IRC



config NF_NAT_SIP

	tristate

	depends on NF_CONNTRACK && NF_NAT

net/netfilter/Makefile

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

obj-$(CONFIG_NF_NAT_IRC) += nf_nat_irc.o

obj-$(CONFIG_NF_NAT_SIP) += nf_nat_sip.o



# transparent proxy support

net/netfilter/nf_conntrack_irc.c

+1 −2
Original line number Diff line number Diff line
@@ -205,8 +205,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, 
					  IPPROTO_TCP, NULL, &port);



			nf_nat_irc = rcu_dereference(nf_nat_irc_hook);

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

			    ct->status & IPS_NAT_MASK)

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

				ret = nf_nat_irc(skb, ctinfo, protoff,

						 addr_beg_p - ib_ptr,

						 addr_end_p - addr_beg_p,