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

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

netfilter: use macros to create module aliases. 



Each NAT helper creates a module alias which follows a pattern.
Use macros for consistency.

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

include/net/netfilter/nf_conntrack_helper.h

+4 −0
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
#include <net/netfilter/nf_conntrack_extend.h>

#include <net/netfilter/nf_conntrack_expect.h>



#define NF_NAT_HELPER_NAME(name)	"ip_nat_" name

#define MODULE_ALIAS_NF_NAT_HELPER(name) \

	MODULE_ALIAS(NF_NAT_HELPER_NAME(name))



struct module;



enum nf_ct_helper_flags {

net/ipv4/netfilter/nf_nat_h323.c

+1 −1
Original line number Diff line number Diff line
@@ -631,4 +631,4 @@ module_exit(fini); 
MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>");

MODULE_DESCRIPTION("H.323 NAT helper");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ip_nat_h323");
 
MODULE_ALIAS_NF_NAT_HELPER("h323");

net/ipv4/netfilter/nf_nat_pptp.c

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
MODULE_LICENSE("GPL");

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

MODULE_DESCRIPTION("Netfilter NAT helper module for PPTP");

MODULE_ALIAS("ip_nat_pptp");

MODULE_ALIAS_NF_NAT_HELPER("pptp");



static void pptp_nat_expected(struct nf_conn *ct,

			      struct nf_conntrack_expect *exp)

net/netfilter/nf_nat_amanda.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>");

MODULE_DESCRIPTION("Amanda NAT helper");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ip_nat_amanda");

MODULE_ALIAS_NF_NAT_HELPER("amanda");



static unsigned int help(struct sk_buff *skb,

			 enum ip_conntrack_info ctinfo,

net/netfilter/nf_nat_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
MODULE_LICENSE("GPL");

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

MODULE_DESCRIPTION("ftp NAT helper");

MODULE_ALIAS("ip_nat_ftp");

MODULE_ALIAS_NF_NAT_HELPER("ftp");



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