Skip to contentSkip to conversation

connection tracking helper name persistent aliases

PATCH Applied Pablo Neira Ayuso 2 participants 2 messages Jul 30, 2008

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Pablo Neira Ayuso

author maintainer
#0 lore raw

PATCH 3/7 connection tracking helper name persistent aliases

[PATCH] 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 <[email protected]>
Signature · 1 line
"Los honestos son inadaptados sociales" -- Les Luthiers

[PATCH] 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 <[email protected]>
include/net/netfilter/nf_conntrack.h +3 -0
Index: net-next-2.6.git/include/net/netfilter/nf_conntrack.h
===================================================================
@@ -292,5 +292,8 @@ do {							\
 	local_bh_enable();				\
 } while (0)
 
+#define MODULE_ALIAS_NFCT_HELPER(helper) \
+        MODULE_ALIAS("nfct-helper-" helper)
+
 #endif /* __KERNEL__ */
 #endif /* _NF_CONNTRACK_H */
net/netfilter/nf_conntrack_amanda.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_amanda.c
===================================================================
@@ -30,6 +30,7 @@ MODULE_AUTHOR("Brian J. Murrell <netfilt
 MODULE_DESCRIPTION("Amanda connection tracking module");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ip_conntrack_amanda");
+MODULE_ALIAS_NFCT_HELPER("amanda");
 
 module_param(master_timeout, uint, 0600);
 MODULE_PARM_DESC(master_timeout, "timeout for the master connection");
net/netfilter/nf_conntrack_ftp.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_ftp.c
===================================================================
@@ -29,6 +29,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Rusty Russell <[email protected]>");
 MODULE_DESCRIPTION("ftp connection tracking helper");
 MODULE_ALIAS("ip_conntrack_ftp");
+MODULE_ALIAS_NFCT_HELPER("ftp");
 
 /* This is slow, but it's simple. --RR */
 static char *ftp_buffer;
net/netfilter/nf_conntrack_h323_main.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_h323_main.c
===================================================================
@@ -1829,3 +1829,4 @@ MODULE_AUTHOR("Jing Min Zhao <zhaojingmi
 MODULE_DESCRIPTION("H.323 connection tracking helper");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ip_conntrack_h323");
+MODULE_ALIAS_NFCT_HELPER("h323");
net/netfilter/nf_conntrack_irc.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_irc.c
===================================================================
@@ -41,6 +41,7 @@ MODULE_AUTHOR("Harald Welte <laforge@net
 MODULE_DESCRIPTION("IRC (DCC) connection tracking helper");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ip_conntrack_irc");
+MODULE_ALIAS_NFCT_HELPER("irc");
 
 module_param_array(ports, ushort, &ports_c, 0400);
 MODULE_PARM_DESC(ports, "port numbers of IRC servers");
net/netfilter/nf_conntrack_netbios_ns.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_netbios_ns.c
===================================================================
@@ -37,6 +37,7 @@ MODULE_AUTHOR("Patrick McHardy <kaber@tr
 MODULE_DESCRIPTION("NetBIOS name service broadcast connection tracking helper");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ip_conntrack_netbios_ns");
+MODULE_ALIAS_NFCT_HELPER("netbios_ns");
 
 static unsigned int timeout __read_mostly = 3;
 module_param(timeout, uint, 0400);
net/netfilter/nf_conntrack_pptp.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_pptp.c
===================================================================
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Harald Welte <[email protected]>");
 MODULE_DESCRIPTION("Netfilter connection tracking helper module for PPTP");
 MODULE_ALIAS("ip_conntrack_pptp");
+MODULE_ALIAS_NFCT_HELPER("pptp");
 
 static DEFINE_SPINLOCK(nf_pptp_lock);
net/netfilter/nf_conntrack_sip.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_sip.c
===================================================================
@@ -28,6 +28,7 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Christian Hentschel <[email protected]>");
 MODULE_DESCRIPTION("SIP connection tracking helper");
 MODULE_ALIAS("ip_conntrack_sip");
+MODULE_ALIAS_NFCT_HELPER("sip");
 
 #define MAX_PORTS	8
 static unsigned short ports[MAX_PORTS];
net/netfilter/nf_conntrack_tftp.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_tftp.c
===================================================================
@@ -22,6 +22,7 @@ MODULE_AUTHOR("Magnus Boden <[email protected]
 MODULE_DESCRIPTION("TFTP connection tracking helper");
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("ip_conntrack_tftp");
+MODULE_ALIAS_NFCT_HELPER("tftp");
 
 #define MAX_PORTS 8
 static unsigned short ports[MAX_PORTS];
net/netfilter/nf_conntrack_sane.c +1 -0
Index: net-next-2.6.git/net/netfilter/nf_conntrack_sane.c
===================================================================
@@ -30,6 +30,7 @@
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Michal Schmidt <[email protected]>");
 MODULE_DESCRIPTION("SANE connection tracking helper");
+MODULE_ALIAS_NFCT_HELPER("sane");
 
 static char *sane_buffer;
Applied
#1 lore raw
Quoted 7 lines · Pablo Neira Ayuso

[PATCH] 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.

Applied, thanks.