| Message ID | 20190326205715.22288-2-fbl@sysclose.org |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | openvswitch: load and reference the NAT helper. | expand |
On Tue, Mar 26, 2019 at 05:57:08PM -0300, Flavio Leitner wrote: > Each NAT helper creates a module alias which follows a pattern. > Use macros for consistency. > > Signed-off-by: Flavio Leitner <fbl@sysclose.org> > --- > include/net/netfilter/nf_conntrack_helper.h | 4 ++++ > net/ipv4/netfilter/nf_nat_h323.c | 2 +- > net/ipv4/netfilter/nf_nat_pptp.c | 2 +- > net/netfilter/nf_nat_amanda.c | 2 +- > net/netfilter/nf_nat_ftp.c | 2 +- > net/netfilter/nf_nat_irc.c | 2 +- > net/netfilter/nf_nat_sip.c | 2 +- > net/netfilter/nf_nat_tftp.c | 2 +- > 8 files changed, 11 insertions(+), 7 deletions(-) > > diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h > index ec52a8dc32fd..e86fadf7e7c5 100644 > --- a/include/net/netfilter/nf_conntrack_helper.h > +++ b/include/net/netfilter/nf_conntrack_helper.h > @@ -15,6 +15,10 @@ > #include <net/netfilter/nf_conntrack_extend.h> > #include <net/netfilter/nf_conntrack_expect.h> > > +#define NF_CT_NAT_HELPER_MOD_NAME(name) "ip_nat_" name I'd suggest a rename from NF_CT_NAT_HELPER_MOD_NAME() to NF_NAT_HELPER_NAME(). Please, also use "nf_nat_" prefix instead, "ip_nat" is legacy stuff. > +#define MODULE_ALIAS_NFCT_HELPER_NAT(name) \ > + MODULE_ALIAS(NF_CT_NAT_HELPER_MOD_NAME(name)) Probably: MODULE_ALIAS_NF_NAT_HELPER instead of MODULE_ALIAS_NFCT_HELPER_NAT.
On Mon, Apr 01, 2019 at 12:07:43AM +0200, Pablo Neira Ayuso wrote: > On Tue, Mar 26, 2019 at 05:57:08PM -0300, Flavio Leitner wrote: > > Each NAT helper creates a module alias which follows a pattern. > > Use macros for consistency. > > > > Signed-off-by: Flavio Leitner <fbl@sysclose.org> > > --- > > include/net/netfilter/nf_conntrack_helper.h | 4 ++++ > > net/ipv4/netfilter/nf_nat_h323.c | 2 +- > > net/ipv4/netfilter/nf_nat_pptp.c | 2 +- > > net/netfilter/nf_nat_amanda.c | 2 +- > > net/netfilter/nf_nat_ftp.c | 2 +- > > net/netfilter/nf_nat_irc.c | 2 +- > > net/netfilter/nf_nat_sip.c | 2 +- > > net/netfilter/nf_nat_tftp.c | 2 +- > > 8 files changed, 11 insertions(+), 7 deletions(-) > > > > diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h > > index ec52a8dc32fd..e86fadf7e7c5 100644 > > --- a/include/net/netfilter/nf_conntrack_helper.h > > +++ b/include/net/netfilter/nf_conntrack_helper.h > > @@ -15,6 +15,10 @@ > > #include <net/netfilter/nf_conntrack_extend.h> > > #include <net/netfilter/nf_conntrack_expect.h> > > > > +#define NF_CT_NAT_HELPER_MOD_NAME(name) "ip_nat_" name > > I'd suggest a rename from NF_CT_NAT_HELPER_MOD_NAME() to > NF_NAT_HELPER_NAME(). OK. > Please, also use "nf_nat_" prefix instead, "ip_nat" is legacy stuff. I don't think we can, because people might be using the current alias which is ip_nat_something. This patch is just making it more robust. > > +#define MODULE_ALIAS_NFCT_HELPER_NAT(name) \ > > + MODULE_ALIAS(NF_CT_NAT_HELPER_MOD_NAME(name)) > > Probably: > > MODULE_ALIAS_NF_NAT_HELPER > > instead of MODULE_ALIAS_NFCT_HELPER_NAT. OK. fbl
diff --git a/include/net/netfilter/nf_conntrack_helper.h b/include/net/netfilter/nf_conntrack_helper.h index ec52a8dc32fd..e86fadf7e7c5 100644 --- a/include/net/netfilter/nf_conntrack_helper.h +++ b/include/net/netfilter/nf_conntrack_helper.h @@ -15,6 +15,10 @@ #include <net/netfilter/nf_conntrack_extend.h> #include <net/netfilter/nf_conntrack_expect.h> +#define NF_CT_NAT_HELPER_MOD_NAME(name) "ip_nat_" name +#define MODULE_ALIAS_NFCT_HELPER_NAT(name) \ + MODULE_ALIAS(NF_CT_NAT_HELPER_MOD_NAME(name)) + struct module; enum nf_ct_helper_flags { diff --git a/net/ipv4/netfilter/nf_nat_h323.c b/net/ipv4/netfilter/nf_nat_h323.c index 4e6b53ab6c33..09754e787692 100644 --- a/net/ipv4/netfilter/nf_nat_h323.c +++ b/net/ipv4/netfilter/nf_nat_h323.c @@ -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_NFCT_HELPER_NAT("h323"); diff --git a/net/ipv4/netfilter/nf_nat_pptp.c b/net/ipv4/netfilter/nf_nat_pptp.c index 68b4d450391b..1a984e5db88a 100644 --- a/net/ipv4/netfilter/nf_nat_pptp.c +++ b/net/ipv4/netfilter/nf_nat_pptp.c @@ -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_NFCT_HELPER_NAT("pptp"); static void pptp_nat_expected(struct nf_conn *ct, struct nf_conntrack_expect *exp) diff --git a/net/netfilter/nf_nat_amanda.c b/net/netfilter/nf_nat_amanda.c index e4d61a7a5258..e87075763f73 100644 --- a/net/netfilter/nf_nat_amanda.c +++ b/net/netfilter/nf_nat_amanda.c @@ -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_NFCT_HELPER_NAT("amanda"); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, diff --git a/net/netfilter/nf_nat_ftp.c b/net/netfilter/nf_nat_ftp.c index 5063cbf1689c..19f5739fd5e2 100644 --- a/net/netfilter/nf_nat_ftp.c +++ b/net/netfilter/nf_nat_ftp.c @@ -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_NFCT_HELPER_NAT("ftp"); /* FIXME: Time out? --RR */ diff --git a/net/netfilter/nf_nat_irc.c b/net/netfilter/nf_nat_irc.c index 3aa35a43100d..c18e3ce6589b 100644 --- a/net/netfilter/nf_nat_irc.c +++ b/net/netfilter/nf_nat_irc.c @@ -26,7 +26,7 @@ MODULE_AUTHOR("Harald Welte <laforge@gnumonks.org>"); MODULE_DESCRIPTION("IRC (DCC) NAT helper"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("ip_nat_irc"); +MODULE_ALIAS_NFCT_HELPER_NAT("irc"); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo, diff --git a/net/netfilter/nf_nat_sip.c b/net/netfilter/nf_nat_sip.c index aa1be643d7a0..f31c2a1b95b8 100644 --- a/net/netfilter/nf_nat_sip.c +++ b/net/netfilter/nf_nat_sip.c @@ -27,7 +27,7 @@ MODULE_LICENSE("GPL"); MODULE_AUTHOR("Christian Hentschel <chentschel@arnet.com.ar>"); MODULE_DESCRIPTION("SIP NAT helper"); -MODULE_ALIAS("ip_nat_sip"); +MODULE_ALIAS_NFCT_HELPER_NAT("sip"); static unsigned int mangle_packet(struct sk_buff *skb, unsigned int protoff, diff --git a/net/netfilter/nf_nat_tftp.c b/net/netfilter/nf_nat_tftp.c index 7f67e1d5310d..51673aa6e1dc 100644 --- a/net/netfilter/nf_nat_tftp.c +++ b/net/netfilter/nf_nat_tftp.c @@ -16,7 +16,7 @@ MODULE_AUTHOR("Magnus Boden <mb@ozaba.mine.nu>"); MODULE_DESCRIPTION("TFTP NAT helper"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("ip_nat_tftp"); +MODULE_ALIAS_NFCT_HELPER_NAT("tftp"); static unsigned int help(struct sk_buff *skb, enum ip_conntrack_info ctinfo,
Each NAT helper creates a module alias which follows a pattern. Use macros for consistency. Signed-off-by: Flavio Leitner <fbl@sysclose.org> --- include/net/netfilter/nf_conntrack_helper.h | 4 ++++ net/ipv4/netfilter/nf_nat_h323.c | 2 +- net/ipv4/netfilter/nf_nat_pptp.c | 2 +- net/netfilter/nf_nat_amanda.c | 2 +- net/netfilter/nf_nat_ftp.c | 2 +- net/netfilter/nf_nat_irc.c | 2 +- net/netfilter/nf_nat_sip.c | 2 +- net/netfilter/nf_nat_tftp.c | 2 +- 8 files changed, 11 insertions(+), 7 deletions(-)