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

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

netfilter: nf_conntrack: connection tracking helper name persistent aliases 



This patch adds the macro MODULE_ALIAS_NFCT_HELPER that defines a
way to provide generic and persistent aliases for the connection
tracking helpers.

This next patch requires this patch.

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

include/net/netfilter/nf_conntrack.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -298,5 +298,8 @@ do { \ 
	local_bh_enable();				\

	local_bh_enable();				\

} while (0)

} while (0)





#define MODULE_ALIAS_NFCT_HELPER(helper) \

        MODULE_ALIAS("nfct-helper-" helper)



#endif /* __KERNEL__ */

#endif /* __KERNEL__ */

#endif /* _NF_CONNTRACK_H */
 
#endif /* _NF_CONNTRACK_H */

net/netfilter/nf_conntrack_amanda.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -30,6 +30,7 @@ MODULE_AUTHOR("Brian J. Murrell <netfilter@interlinx.bc.ca>"); 
MODULE_DESCRIPTION("Amanda connection tracking module");

MODULE_DESCRIPTION("Amanda connection tracking module");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ip_conntrack_amanda");

MODULE_ALIAS("ip_conntrack_amanda");

MODULE_ALIAS_NFCT_HELPER("amanda");





module_param(master_timeout, uint, 0600);

module_param(master_timeout, uint, 0600);

MODULE_PARM_DESC(master_timeout, "timeout for the master connection");

MODULE_PARM_DESC(master_timeout, "timeout for the master connection");

net/netfilter/nf_conntrack_ftp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -29,6 +29,7 @@ MODULE_LICENSE("GPL"); 
MODULE_AUTHOR("Rusty Russell <rusty@rustcorp.com.au>");

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

MODULE_DESCRIPTION("ftp connection tracking helper");

MODULE_DESCRIPTION("ftp connection tracking helper");

MODULE_ALIAS("ip_conntrack_ftp");

MODULE_ALIAS("ip_conntrack_ftp");

MODULE_ALIAS_NFCT_HELPER("ftp");





/* This is slow, but it's simple. --RR */

/* This is slow, but it's simple. --RR */

static char *ftp_buffer;

static char *ftp_buffer;

net/netfilter/nf_conntrack_h323_main.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -1827,3 +1827,4 @@ MODULE_AUTHOR("Jing Min Zhao <zhaojingmin@users.sourceforge.net>"); 
MODULE_DESCRIPTION("H.323 connection tracking helper");

MODULE_DESCRIPTION("H.323 connection tracking helper");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ip_conntrack_h323");

MODULE_ALIAS("ip_conntrack_h323");

MODULE_ALIAS_NFCT_HELPER("h323");

net/netfilter/nf_conntrack_irc.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -41,6 +41,7 @@ MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>"); 
MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");

MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");

MODULE_ALIAS("ip_conntrack_irc");

MODULE_ALIAS("ip_conntrack_irc");

MODULE_ALIAS_NFCT_HELPER("irc");





module_param_array(ports, ushort, &ports_c, 0400);

module_param_array(ports, ushort, &ports_c, 0400);

MODULE_PARM_DESC(ports, "port numbers of IRC servers");

MODULE_PARM_DESC(ports, "port numbers of IRC servers");