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

Commit 53b11308 authored by Flavio Leitner's avatar Flavio Leitner Committed by Pablo Neira Ayuso
Browse files

netfilter: nf_nat: register NAT helpers. 



Register amanda, ftp, irc, sip and tftp NAT helpers.

Signed-off-by: default avatarFlavio Leitner <fbl@redhat.com>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 08010a21

net/netfilter/nf_nat_amanda.c

+8 −1
Original line number Diff line number Diff line
@@ -19,10 +19,15 @@ 
#include <net/netfilter/nf_nat_helper.h>

#include <linux/netfilter/nf_conntrack_amanda.h>



#define NAT_HELPER_NAME "amanda"



MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");

MODULE_DESCRIPTION("Amanda NAT helper");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NF_NAT_HELPER("amanda");

MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME);



static struct nf_conntrack_nat_helper nat_helper_amanda =

	NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME);



static unsigned int help(struct sk_buff *skb,

			 enum ip_conntrack_info ctinfo,
@@ -74,6 +79,7 @@ static unsigned int help(struct sk_buff *skb, 


static void __exit nf_nat_amanda_fini(void)

{

	nf_nat_helper_unregister(&nat_helper_amanda);

	RCU_INIT_POINTER(nf_nat_amanda_hook, NULL);

	synchronize_rcu();

}
@@ -81,6 +87,7 @@ static void __exit nf_nat_amanda_fini(void) 
static int __init nf_nat_amanda_init(void)

{

	BUG_ON(nf_nat_amanda_hook != NULL);

	nf_nat_helper_register(&nat_helper_amanda);

	RCU_INIT_POINTER(nf_nat_amanda_hook, help);

	return 0;

}

net/netfilter/nf_nat_ftp.c

+8 −1
Original line number Diff line number Diff line
@@ -21,13 +21,18 @@ 
#include <net/netfilter/nf_conntrack_expect.h>

#include <linux/netfilter/nf_conntrack_ftp.h>



#define NAT_HELPER_NAME "ftp"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Rusty Russell <rusty@rustcorp.com.au>");

MODULE_DESCRIPTION("ftp NAT helper");

MODULE_ALIAS_NF_NAT_HELPER("ftp");

MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME);



/* FIXME: Time out? --RR */



static struct nf_conntrack_nat_helper nat_helper_ftp =

	NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME);



static int nf_nat_ftp_fmt_cmd(struct nf_conn *ct, enum nf_ct_ftp_type type,

			      char *buffer, size_t buflen,

			      union nf_inet_addr *addr, u16 port)
@@ -124,6 +129,7 @@ static unsigned int nf_nat_ftp(struct sk_buff *skb, 


static void __exit nf_nat_ftp_fini(void)

{

	nf_nat_helper_unregister(&nat_helper_ftp);

	RCU_INIT_POINTER(nf_nat_ftp_hook, NULL);

	synchronize_rcu();

}
@@ -131,6 +137,7 @@ static void __exit nf_nat_ftp_fini(void) 
static int __init nf_nat_ftp_init(void)

{

	BUG_ON(nf_nat_ftp_hook != NULL);

	nf_nat_helper_register(&nat_helper_ftp);

	RCU_INIT_POINTER(nf_nat_ftp_hook, nf_nat_ftp);

	return 0;

}

net/netfilter/nf_nat_irc.c

+8 −1
Original line number Diff line number Diff line
@@ -23,10 +23,15 @@ 
#include <net/netfilter/nf_conntrack_expect.h>

#include <linux/netfilter/nf_conntrack_irc.h>



#define NAT_HELPER_NAME "irc"



MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");

MODULE_DESCRIPTION("IRC (DCC) NAT helper");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NF_NAT_HELPER("irc");

MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME);



static struct nf_conntrack_nat_helper nat_helper_irc =

	NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME);



static unsigned int help(struct sk_buff *skb,

			 enum ip_conntrack_info ctinfo,
@@ -96,6 +101,7 @@ static unsigned int help(struct sk_buff *skb, 


static void __exit nf_nat_irc_fini(void)

{

	nf_nat_helper_unregister(&nat_helper_irc);

	RCU_INIT_POINTER(nf_nat_irc_hook, NULL);

	synchronize_rcu();

}
@@ -103,6 +109,7 @@ static void __exit nf_nat_irc_fini(void) 
static int __init nf_nat_irc_init(void)

{

	BUG_ON(nf_nat_irc_hook != NULL);

	nf_nat_helper_register(&nat_helper_irc);

	RCU_INIT_POINTER(nf_nat_irc_hook, help);

	return 0;

}

net/netfilter/nf_nat_sip.c

+7 −2
Original line number Diff line number Diff line
@@ -24,11 +24,15 @@ 
#include <net/netfilter/nf_conntrack_seqadj.h>

#include <linux/netfilter/nf_conntrack_sip.h>



#define NAT_HELPER_NAME "sip"



MODULE_LICENSE("GPL");

MODULE_AUTHOR("Christian Hentschel <chentschel@arnet.com.ar>");

MODULE_DESCRIPTION("SIP NAT helper");

MODULE_ALIAS_NF_NAT_HELPER("sip");

MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME);



static struct nf_conntrack_nat_helper nat_helper_sip =

	NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME);



static unsigned int mangle_packet(struct sk_buff *skb, unsigned int protoff,

				  unsigned int dataoff,
@@ -656,8 +660,8 @@ static struct nf_ct_helper_expectfn sip_nat = { 


static void __exit nf_nat_sip_fini(void)

{

	nf_nat_helper_unregister(&nat_helper_sip);

	RCU_INIT_POINTER(nf_nat_sip_hooks, NULL);



	nf_ct_helper_expectfn_unregister(&sip_nat);

	synchronize_rcu();

}
@@ -675,6 +679,7 @@ static const struct nf_nat_sip_hooks sip_hooks = { 
static int __init nf_nat_sip_init(void)

{

	BUG_ON(nf_nat_sip_hooks != NULL);

	nf_nat_helper_register(&nat_helper_sip);

	RCU_INIT_POINTER(nf_nat_sip_hooks, &sip_hooks);

	nf_ct_helper_expectfn_register(&sip_nat);

	return 0;

net/netfilter/nf_nat_tftp.c

+8 −1
Original line number Diff line number Diff line
@@ -13,10 +13,15 @@ 
#include <net/netfilter/nf_nat_helper.h>

#include <linux/netfilter/nf_conntrack_tftp.h>



#define NAT_HELPER_NAME "tftp"



MODULE_AUTHOR("Magnus Boden <mb@ozaba.mine.nu>");

MODULE_DESCRIPTION("TFTP NAT helper");

MODULE_LICENSE("GPL");

MODULE_ALIAS_NF_NAT_HELPER("tftp");

MODULE_ALIAS_NF_NAT_HELPER(NAT_HELPER_NAME);



static struct nf_conntrack_nat_helper nat_helper_tftp =

	NF_CT_NAT_HELPER_INIT(NAT_HELPER_NAME);



static unsigned int help(struct sk_buff *skb,

			 enum ip_conntrack_info ctinfo,
@@ -37,6 +42,7 @@ static unsigned int help(struct sk_buff *skb, 


static void __exit nf_nat_tftp_fini(void)

{

	nf_nat_helper_unregister(&nat_helper_tftp);

	RCU_INIT_POINTER(nf_nat_tftp_hook, NULL);

	synchronize_rcu();

}
@@ -44,6 +50,7 @@ static void __exit nf_nat_tftp_fini(void) 
static int __init nf_nat_tftp_init(void)

{

	BUG_ON(nf_nat_tftp_hook != NULL);

	nf_nat_helper_register(&nat_helper_tftp);

	RCU_INIT_POINTER(nf_nat_tftp_hook, help);

	return 0;

}