From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Patrick McHardy <kaber@trash.net>
Cc: Netfilter Development Mailinglist <netfilter-devel@vger.kernel.org>
Subject: [PATCH 3/7] connection tracking helper name persistent aliases
Date: Wed, 30 Jul 2008 13:03:28 +0200 [thread overview]
Message-ID: <48904A80.4040006@netfilter.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 364 bytes --]
[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 <pablo@netfilter.org>
--
"Los honestos son inadaptados sociales" -- Les Luthiers
[-- Attachment #2: 02.patch --]
[-- Type: text/x-diff, Size: 6267 bytes --]
[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 <pablo@netfilter.org>
Index: net-next-2.6.git/include/net/netfilter/nf_conntrack.h
===================================================================
--- net-next-2.6.git.orig/include/net/netfilter/nf_conntrack.h 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/include/net/netfilter/nf_conntrack.h 2008-07-29 14:30:12.000000000 +0200
@@ -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 */
Index: net-next-2.6.git/net/netfilter/nf_conntrack_amanda.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_amanda.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_amanda.c 2008-07-29 14:30:12.000000000 +0200
@@ -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");
Index: net-next-2.6.git/net/netfilter/nf_conntrack_ftp.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_ftp.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_ftp.c 2008-07-29 14:30:12.000000000 +0200
@@ -29,6 +29,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Rusty Russell <rusty@rustcorp.com.au>");
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;
Index: net-next-2.6.git/net/netfilter/nf_conntrack_h323_main.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_h323_main.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_h323_main.c 2008-07-29 14:30:12.000000000 +0200
@@ -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");
Index: net-next-2.6.git/net/netfilter/nf_conntrack_irc.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_irc.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_irc.c 2008-07-29 14:30:12.000000000 +0200
@@ -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");
Index: net-next-2.6.git/net/netfilter/nf_conntrack_netbios_ns.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_netbios_ns.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_netbios_ns.c 2008-07-29 14:30:12.000000000 +0200
@@ -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);
Index: net-next-2.6.git/net/netfilter/nf_conntrack_pptp.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_pptp.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_pptp.c 2008-07-29 14:30:12.000000000 +0200
@@ -37,6 +37,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>");
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);
Index: net-next-2.6.git/net/netfilter/nf_conntrack_sip.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_sip.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_sip.c 2008-07-29 14:30:12.000000000 +0200
@@ -28,6 +28,7 @@ MODULE_LICENSE("GPL");
MODULE_AUTHOR("Christian Hentschel <chentschel@arnet.com.ar>");
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];
Index: net-next-2.6.git/net/netfilter/nf_conntrack_tftp.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_tftp.c 2008-07-29 14:30:10.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_tftp.c 2008-07-29 14:30:12.000000000 +0200
@@ -22,6 +22,7 @@ MODULE_AUTHOR("Magnus Boden <mb@ozaba.mi
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];
Index: net-next-2.6.git/net/netfilter/nf_conntrack_sane.c
===================================================================
--- net-next-2.6.git.orig/net/netfilter/nf_conntrack_sane.c 2008-07-30 08:50:29.000000000 +0200
+++ net-next-2.6.git/net/netfilter/nf_conntrack_sane.c 2008-07-30 08:51:02.000000000 +0200
@@ -30,6 +30,7 @@
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Michal Schmidt <mschmidt@redhat.com>");
MODULE_DESCRIPTION("SANE connection tracking helper");
+MODULE_ALIAS_NFCT_HELPER("sane");
static char *sane_buffer;
next reply other threads:[~2008-07-30 11:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-30 11:03 Pablo Neira Ayuso [this message]
2008-07-30 13:26 ` [PATCH 3/7] connection tracking helper name persistent aliases Patrick McHardy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=48904A80.4040006@netfilter.org \
--to=pablo@netfilter.org \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.