tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Patrick McHardy <kaber@trash.net>

authored by

Pablo Neira Ayuso and committed by
Patrick McHardy 4dc06f96 528a3a6f

+12
+3
include/net/netfilter/nf_conntrack.h
··· 298 298 local_bh_enable(); \ 299 299 } while (0) 300 300 301 + #define MODULE_ALIAS_NFCT_HELPER(helper) \ 302 + MODULE_ALIAS("nfct-helper-" helper) 303 + 301 304 #endif /* __KERNEL__ */ 302 305 #endif /* _NF_CONNTRACK_H */
+1
net/netfilter/nf_conntrack_amanda.c
··· 30 30 MODULE_DESCRIPTION("Amanda connection tracking module"); 31 31 MODULE_LICENSE("GPL"); 32 32 MODULE_ALIAS("ip_conntrack_amanda"); 33 + MODULE_ALIAS_NFCT_HELPER("amanda"); 33 34 34 35 module_param(master_timeout, uint, 0600); 35 36 MODULE_PARM_DESC(master_timeout, "timeout for the master connection");
+1
net/netfilter/nf_conntrack_ftp.c
··· 29 29 MODULE_AUTHOR("Rusty Russell <rusty@rustcorp.com.au>"); 30 30 MODULE_DESCRIPTION("ftp connection tracking helper"); 31 31 MODULE_ALIAS("ip_conntrack_ftp"); 32 + MODULE_ALIAS_NFCT_HELPER("ftp"); 32 33 33 34 /* This is slow, but it's simple. --RR */ 34 35 static char *ftp_buffer;
+1
net/netfilter/nf_conntrack_h323_main.c
··· 1827 1827 MODULE_DESCRIPTION("H.323 connection tracking helper"); 1828 1828 MODULE_LICENSE("GPL"); 1829 1829 MODULE_ALIAS("ip_conntrack_h323"); 1830 + MODULE_ALIAS_NFCT_HELPER("h323");
+1
net/netfilter/nf_conntrack_irc.c
··· 41 41 MODULE_DESCRIPTION("IRC (DCC) connection tracking helper"); 42 42 MODULE_LICENSE("GPL"); 43 43 MODULE_ALIAS("ip_conntrack_irc"); 44 + MODULE_ALIAS_NFCT_HELPER("irc"); 44 45 45 46 module_param_array(ports, ushort, &ports_c, 0400); 46 47 MODULE_PARM_DESC(ports, "port numbers of IRC servers");
+1
net/netfilter/nf_conntrack_netbios_ns.c
··· 37 37 MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper"); 38 38 MODULE_LICENSE("GPL"); 39 39 MODULE_ALIAS("ip_conntrack_netbios_ns"); 40 + MODULE_ALIAS_NFCT_HELPER("netbios_ns"); 40 41 41 42 static unsigned int timeout __read_mostly = 3; 42 43 module_param(timeout, uint, 0400);
+1
net/netfilter/nf_conntrack_pptp.c
··· 37 37 MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); 38 38 MODULE_DESCRIPTION("Netfilter connection tracking helper module for PPTP"); 39 39 MODULE_ALIAS("ip_conntrack_pptp"); 40 + MODULE_ALIAS_NFCT_HELPER("pptp"); 40 41 41 42 static DEFINE_SPINLOCK(nf_pptp_lock); 42 43
+1
net/netfilter/nf_conntrack_sane.c
··· 30 30 MODULE_LICENSE("GPL"); 31 31 MODULE_AUTHOR("Michal Schmidt <mschmidt@redhat.com>"); 32 32 MODULE_DESCRIPTION("SANE connection tracking helper"); 33 + MODULE_ALIAS_NFCT_HELPER("sane"); 33 34 34 35 static char *sane_buffer; 35 36
+1
net/netfilter/nf_conntrack_sip.c
··· 28 28 MODULE_AUTHOR("Christian Hentschel <chentschel@arnet.com.ar>"); 29 29 MODULE_DESCRIPTION("SIP connection tracking helper"); 30 30 MODULE_ALIAS("ip_conntrack_sip"); 31 + MODULE_ALIAS_NFCT_HELPER("sip"); 31 32 32 33 #define MAX_PORTS 8 33 34 static unsigned short ports[MAX_PORTS];
+1
net/netfilter/nf_conntrack_tftp.c
··· 22 22 MODULE_DESCRIPTION("TFTP connection tracking helper"); 23 23 MODULE_LICENSE("GPL"); 24 24 MODULE_ALIAS("ip_conntrack_tftp"); 25 + MODULE_ALIAS_NFCT_HELPER("tftp"); 25 26 26 27 #define MAX_PORTS 8 27 28 static unsigned short ports[MAX_PORTS];