netfilter: Use pr_<level> and pr_fmt
Subsystems (4)
cover netfilter: Use pr_<level> and pr_fmt
Many of the calls to netfilter printk calls do not have KERN_<level> prefixes.
Convert printks with KERN_<level> to pr_<level> and use pr_info for unprefixed printks.
Remove the function names in printk strings and add #define pr_fmt(fmt) "%s:%s " fmt, KBUILD_MODNAME, __func__
Added a couple of spelling fixes along the way.
One negative of these patches is that some of the pr_debug calls have prefixes like "nf_ct_h323:" that are lost in the conversion.
Joe Perches (3):
x_tables: Convert printk to pr_err net/netfilter: Convert printk uses to pr_<level> netfilter h323_asn1.c: convert PRINT to pr_info
net/netfilter/nf_conntrack_acct.c | 12 ++- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_core.c | 43 +++++------ net/netfilter/nf_conntrack_expect.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 46 ++++++------ net/netfilter/nf_conntrack_h323_asn1.c | 3 +- net/netfilter/nf_conntrack_h323_main.c | 123 +++++++++++++++---------------- net/netfilter/nf_conntrack_helper.c | 2 + net/netfilter/nf_conntrack_irc.c | 16 ++-- net/netfilter/nf_conntrack_netlink.c | 14 ++-- net/netfilter/nf_conntrack_pptp.c | 2 + net/netfilter/nf_conntrack_proto_gre.c | 2 + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- net/netfilter/nf_conntrack_proto_tcp.c | 28 ++++--- net/netfilter/nf_conntrack_sane.c | 20 +++--- net/netfilter/nf_conntrack_sip.c | 10 ++- net/netfilter/nf_conntrack_standalone.c | 4 +- net/netfilter/nf_conntrack_tftp.c | 6 +- net/netfilter/nf_tproxy_core.c | 2 + net/netfilter/nfnetlink.c | 8 +- net/netfilter/nfnetlink_log.c | 9 ++- net/netfilter/nfnetlink_queue.c | 18 +++-- net/netfilter/x_tables.c | 16 ++-- net/netfilter/xt_CONNMARK.c | 18 +++-- net/netfilter/xt_CONNSECMARK.c | 13 ++- net/netfilter/xt_DSCP.c | 6 +- net/netfilter/xt_HL.c | 11 +-- net/netfilter/xt_LED.c | 12 ++-- net/netfilter/xt_MARK.c | 9 +- net/netfilter/xt_SECMARK.c | 23 +++--- net/netfilter/xt_TCPMSS.c | 22 +++--- net/netfilter/xt_cluster.c | 11 ++- net/netfilter/xt_connbytes.c | 7 +- net/netfilter/xt_connlimit.c | 7 +- net/netfilter/xt_connmark.c | 12 ++- net/netfilter/xt_conntrack.c | 6 +- net/netfilter/xt_dscp.c | 4 +- net/netfilter/xt_hashlimit.c | 27 +++---- net/netfilter/xt_helper.c | 6 +- net/netfilter/xt_hl.c | 8 +- net/netfilter/xt_iprange.c | 3 + net/netfilter/xt_limit.c | 6 +- net/netfilter/xt_mark.c | 4 +- net/netfilter/xt_osf.c | 8 +- net/netfilter/xt_owner.c | 10 +- net/netfilter/xt_physdev.c | 8 +- net/netfilter/xt_policy.c | 13 ++-- net/netfilter/xt_recent.c | 12 ++- net/netfilter/xt_socket.c | 5 +- net/netfilter/xt_state.c | 6 +- net/netfilter/xt_statistic.c | 4 +- net/netfilter/xt_time.c | 16 ++-- 52 files changed, 385 insertions(+), 312 deletions(-)
PATCH 1/3 x_tables: Convert printk to pr_err
Signed-off-by Joe Perches <[email protected]>
--- net/netfilter/x_tables.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/netfilter/x_tables.c +8 -8
@@ -364,14 +364,14 @@ int xt_check_match(struct xt_mtchk_param *par,* ebt_among is exempt from centralized matchsize checking * because it uses a dynamic-size data set. */ -printk ("%s_tables: %s match: invalid size %Zu != %u\n" , +pr_err ("%s_tables: %s match: invalid size %Zu != %u\n" , xt_prefix[par->family], par->match->name,XT_ALIGN (par->match->matchsize), size);return -EINVAL ; }if (par->match->table !=NULL &&strcmp (par->match->table, par->table) !=0 ) { -printk ("%s_tables: %s match: only valid in %s table, not %s\n" , +pr_err ("%s_tables: %s match: only valid in %s table, not %s\n" , xt_prefix[par->family], par->match->name, par->match->table, par->table);return -EINVAL ;
@@ -379,7 +379,7 @@ int xt_check_match(struct xt_mtchk_param *par,if (par->match->hooks && (par->hook_mask & ~par->match->hooks) !=0 ) {char used[64 ], allow[64 ]; - printk("%s_tables: %s match: used from hooks %s, but only " + pr_err("%s_tables: %s match: used from hooks %s, but only " "valid from %s\n", xt_prefix[par->family], par->match->name, textify_hooks(used, sizeof(used), par->hook_mask),
@@ -387,7 +387,7 @@ int xt_check_match(struct xt_mtchk_param *par,return -EINVAL ; }if (par->match->proto && (par->match->proto != proto || inv_proto)) { -printk ("%s_tables: %s match: only valid for protocol %u\n" , +pr_err ("%s_tables: %s match: only valid for protocol %u\n" , xt_prefix[par->family], par->match->name, par->match->proto);return -EINVAL ;
@@ -514,14 +514,14 @@ int xt_check_target(struct xt_tgchk_param *par, unsigned int size, u_int8_t proto, bool inv_proto) { if (XT_ALIGN(par->target->targetsize) != size) { - printk("%s_tables: %s target: invalid size %Zu != %u\n", + pr_err("%s_tables: %s target: invalid size %Zu != %u\n", xt_prefix[par->family], par->target->name, XT_ALIGN(par->target->targetsize), size);return -EINVAL ; }if (par->target->table !=NULL &&strcmp (par->target->table, par->table) !=0 ) { -printk ("%s_tables: %s target: only valid in %s table, not %s\n" , +pr_err ("%s_tables: %s target: only valid in %s table, not %s\n" , xt_prefix[par->family], par->target->name, par->target->table, par->table);return -EINVAL ;
@@ -529,7 +529,7 @@ int xt_check_target(struct xt_tgchk_param *par,if (par->target->hooks && (par->hook_mask & ~par->target->hooks) !=0 ) {char used[64 ], allow[64 ]; - printk("%s_tables: %s target: used from hooks %s, but only " + pr_err("%s_tables: %s target: used from hooks %s, but only " "usable from %s\n", xt_prefix[par->family], par->target->name, textify_hooks(used, sizeof(used), par->hook_mask),
@@ -537,7 +537,7 @@ int xt_check_target(struct xt_tgchk_param *par,return -EINVAL ; }if (par->target->proto && (par->target->proto != proto || inv_proto)) { -printk ("%s_tables: %s target: only valid for protocol %u\n" , +pr_err ("%s_tables: %s target: only valid for protocol %u\n" , xt_prefix[par->family], par->target->name, par->target->proto);return -EINVAL ;
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 2/3 net/netfilter: Convert printk uses to pr_<level>
In reply to Joe PerchesRemove function names from format strings
Add #define pr_fmt(fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__
Signed-off-by Joe Perches <[email protected]>
--- net/netfilter/nf_conntrack_acct.c | 12 ++- net/netfilter/nf_conntrack_amanda.c | 5 +- net/netfilter/nf_conntrack_core.c | 43 +++++------ net/netfilter/nf_conntrack_expect.c | 5 +- net/netfilter/nf_conntrack_ftp.c | 46 ++++++------ net/netfilter/nf_conntrack_h323_main.c | 123 +++++++++++++++---------------- net/netfilter/nf_conntrack_helper.c | 2 + net/netfilter/nf_conntrack_irc.c | 16 ++-- net/netfilter/nf_conntrack_netlink.c | 14 ++-- net/netfilter/nf_conntrack_pptp.c | 2 + net/netfilter/nf_conntrack_proto_gre.c | 2 + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- net/netfilter/nf_conntrack_proto_tcp.c | 28 ++++--- net/netfilter/nf_conntrack_sane.c | 20 +++--- net/netfilter/nf_conntrack_sip.c | 10 ++- net/netfilter/nf_conntrack_standalone.c | 4 +- net/netfilter/nf_conntrack_tftp.c | 6 +- net/netfilter/nf_tproxy_core.c | 2 + net/netfilter/nfnetlink.c | 8 +- net/netfilter/nfnetlink_log.c | 9 ++- net/netfilter/nfnetlink_queue.c | 18 +++-- net/netfilter/xt_CONNMARK.c | 18 +++-- net/netfilter/xt_CONNSECMARK.c | 13 ++- net/netfilter/xt_DSCP.c | 6 +- net/netfilter/xt_HL.c | 11 +-- net/netfilter/xt_LED.c | 12 ++-- net/netfilter/xt_MARK.c | 9 +- net/netfilter/xt_SECMARK.c | 23 +++--- net/netfilter/xt_TCPMSS.c | 22 +++--- net/netfilter/xt_cluster.c | 11 ++- net/netfilter/xt_connbytes.c | 7 +- net/netfilter/xt_connlimit.c | 7 +- net/netfilter/xt_connmark.c | 12 ++- net/netfilter/xt_conntrack.c | 6 +- net/netfilter/xt_dscp.c | 4 +- net/netfilter/xt_hashlimit.c | 27 +++---- net/netfilter/xt_helper.c | 6 +- net/netfilter/xt_hl.c | 8 +- net/netfilter/xt_iprange.c | 3 + net/netfilter/xt_limit.c | 6 +- net/netfilter/xt_mark.c | 4 +- net/netfilter/xt_osf.c | 8 +- net/netfilter/xt_owner.c | 10 +- net/netfilter/xt_physdev.c | 8 +- net/netfilter/xt_policy.c | 13 ++-- net/netfilter/xt_recent.c | 12 ++- net/netfilter/xt_socket.c | 5 +- net/netfilter/xt_state.c | 6 +- net/netfilter/xt_statistic.c | 4 +- net/netfilter/xt_time.c | 16 ++-- 50 files changed, 375 insertions(+), 303 deletions(-)
net/netfilter/nf_conntrack_acct.c +7 -5
@@ -8,6 +8,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/netfilter.h> #include <linux/kernel.h> #include <linux/moduleparam.h>
@@ -77,7 +79,7 @@ static int nf_conntrack_acct_init_sysctl(struct net *net) net->ct.acct_sysctl_header =register_net_sysctl_table (net, nf_net_netfilter_sysctl_path, table);if (!net->ct.acct_sysctl_header) { -printk (KERN_ERR "nf_conntrack_acct: can't register to sysctl.\n" ); +pr_err ("can't register to sysctl.\n" ); goto out_register; }return 0 ;
@@ -115,14 +117,14 @@ int nf_conntrack_acct_init(struct net *net)if (net_eq (net, &init_net)) {#ifdef CONFIG_NF_CT_ACCT -printk (KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n" ); -printk (KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n" ); -printk (KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n" ); +pr_warning ("CONFIG_NF_CT_ACCT is deprecated and will be removed soon.\n" ); +pr_warning ("Please use nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack\n" ); +pr_warning ("module option or sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n" );#endif ret =nf_ct_extend_register (&acct_extend);if (ret <0 ) { -printk (KERN_ERR "nf_conntrack_acct: Unable to register extension\n" ); +pr_err ("Unable to register extension\n" ); goto out_extend_register; } }
net/netfilter/nf_conntrack_amanda.c +4 -1
@@ -8,6 +8,9 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/kernel.h> #include <linux/module.h> #include <linux/moduleparam.h>
@@ -107,7 +110,7 @@ static int amanda_help(struct sk_buff *skb, dataoff = protoff +sizeof (struct udphdr );if (dataoff >= skb->len) {if (net_ratelimit ()) -printk ("amanda_help: skblen = %u\n" , skb->len); +pr_info ("skblen = %u\n" , skb->len);return NF_ACCEPT ; }
net/netfilter/nf_conntrack_core.c +21 -22
142 lines not on this page · raw message
net/netfilter/nf_conntrack_expect.c +3 -2
@@ -9,6 +9,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/types.h> #include <linux/netfilter.h> #include <linux/skbuff.h>
@@ -404,8 +406,7 @@ static inline int __nf_ct_expect_check(struct nf_conntrack_expect *expect)if (net->ct.expect_count >= nf_ct_expect_max) {if (net_ratelimit ()) -printk (KERN_WARNING -"nf_conntrack: expectation table full\n" ); +pr_warning ("expectation table full\n" ); ret = -EMFILE ; } out:
net/netfilter/nf_conntrack_ftp.c +23 -23
154 lines not on this page · raw message
net/netfilter/nf_conntrack_h323_main.c +60 -63
458 lines not on this page · raw message
net/netfilter/nf_conntrack_helper.c +2 -0
@@ -9,6 +9,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/types.h> #include <linux/netfilter.h> #include <linux/module.h>
net/netfilter/nf_conntrack_irc.c +8 -8
@@ -8,6 +8,8 @@* 2 of the License, or (at your option) any later version. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/skbuff.h>
@@ -186,10 +188,9 @@ static int help(struct sk_buff *skb, unsigned int protoff,if (tuple->src.u3.ip != dcc_ip && tuple->dst.u3.ip != dcc_ip) {if (net_ratelimit ()) -printk (KERN_WARNING -"Forged DCC command from %pI4: %pI4:%u\n" , - &tuple->src.u3.ip, - &dcc_ip, dcc_port); +pr_warning ("Forged DCC command from %pI4: %pI4:%u\n" , + &tuple->src.u3.ip, + &dcc_ip, dcc_port);continue ; }
@@ -234,7 +235,7 @@ static int __init nf_conntrack_irc_init(void)char *tmpname;if (max_dcc_channels <1 ) { -printk ("nf_ct_irc: max_dcc_channels must not be zero\n" ); +pr_info ("max_dcc_channels must not be zero\n" );return -EINVAL ; }
@@ -266,9 +267,8 @@ static int __init nf_conntrack_irc_init(void) ret =nf_conntrack_helper_register (&irc[i]);if (ret) { -printk ("nf_ct_irc: failed to register helper " -"for pf: %u port: %u\n" , - irc[i].tuple.src.l3num, ports[i]); +pr_info ("failed to register helper for pf: %u port: %u\n" , + irc[i].tuple.src.l3num, ports[i]);nf_conntrack_irc_fini ();return ret; }
net/netfilter/nf_conntrack_netlink.c +8 -6
@@ -15,6 +15,8 @@* of the GNU General Public License, incorporated herein by reference. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/init.h> #include <linux/module.h> #include <linux/kernel.h>
@@ -1920,29 +1922,29 @@ static int __init ctnetlink_init(void) {int ret; -printk ("ctnetlink v%s: registering with nfnetlink.\n" , version); +pr_info ("v%s: registering with nfnetlink.\n" , version); ret =nfnetlink_subsys_register (&ctnl_subsys);if (ret <0 ) { -printk ("ctnetlink_init: cannot register with nfnetlink.\n" ); +pr_info ("cannot register with nfnetlink.\n" ); goto err_out; } ret =nfnetlink_subsys_register (&ctnl_exp_subsys);if (ret <0 ) { -printk ("ctnetlink_init: cannot register exp with nfnetlink.\n" ); +pr_info ("cannot register exp with nfnetlink.\n" ); goto err_unreg_subsys; }#ifdef CONFIG_NF_CONNTRACK_EVENTS ret =nf_conntrack_register_notifier (&ctnl_notifier);if (ret <0 ) { -printk ("ctnetlink_init: cannot register notifier.\n" ); +pr_info ("cannot register notifier.\n" ); goto err_unreg_exp_subsys; } ret =nf_ct_expect_register_notifier (&ctnl_notifier_exp);if (ret <0 ) { -printk ("ctnetlink_init: cannot expect register notifier.\n" ); +pr_info ("cannot expect register notifier.\n" ); goto err_unreg_notifier; }#endif
@@ -1963,7 +1965,7 @@ err_out: static void __exit ctnetlink_exit(void) { -printk ("ctnetlink: unregistering from nfnetlink.\n" ); +pr_info ("unregistering from nfnetlink.\n" );#ifdef CONFIG_NF_CONNTRACK_EVENTS nf_ct_expect_unregister_notifier (&ctnl_notifier_exp);
net/netfilter/nf_conntrack_pptp.c +2 -0
@@ -20,6 +20,8 @@* - testing of incoming PPTP calls */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/in.h>
net/netfilter/nf_conntrack_proto_gre.c +2 -0
@@ -23,6 +23,8 @@* */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/types.h> #include <linux/timer.h>
net/netfilter/nf_conntrack_proto_sctp.c +4 -2
@@ -9,6 +9,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/types.h> #include <linux/timer.h> #include <linux/netfilter.h>
@@ -721,12 +723,12 @@ static int __init nf_conntrack_proto_sctp_init(void) ret =nf_conntrack_l4proto_register (&nf_conntrack_l4proto_sctp4);if (ret) { -printk ("nf_conntrack_l4proto_sctp4: protocol register failed\n" ); +pr_info ("nf_conntrack_l4proto_sctp4: protocol register failed\n" ); goto out; } ret =nf_conntrack_l4proto_register (&nf_conntrack_l4proto_sctp6);if (ret) { -printk ("nf_conntrack_l4proto_sctp6: protocol register failed\n" ); +pr_info ("nf_conntrack_l4proto_sctp6: protocol register failed\n" ); goto cleanup_sctp4; }
net/netfilter/nf_conntrack_proto_tcp.c +16 -12
@@ -6,6 +6,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/types.h> #include <linux/timer.h> #include <linux/module.h>
@@ -519,12 +521,12 @@ static bool tcp_in_window(const struct nf_conn *ct,if (receiver->flags &IP_CT_TCP_FLAG_SACK_PERM )tcp_sack (skb, dataoff, tcph, &sack); -pr_debug ("tcp_in_window: START\n" ); -pr_debug ("tcp_in_window: " ); +pr_debug ("START\n" ); +pr_debug ("" );nf_ct_dump_tuple (tuple);pr_debug ("seq=%u ack=%u sack=%u win=%u end=%u\n" , seq, ack, sack, win, end); - pr_debug("tcp_in_window: sender end=%u maxend=%u maxwin=%u scale=%i " + pr_debug("sender end=%u maxend=%u maxwin=%u scale=%i " "receiver end=%u maxend=%u maxwin=%u scale=%i\n", sender->td_end, sender->td_maxend, sender->td_maxwin, sender->td_scale,
@@ -611,18 +613,18 @@ static bool tcp_in_window(const struct nf_conn *ct,*/ seq = end = sender->td_end; -pr_debug ("tcp_in_window: " ); +pr_debug ("" );nf_ct_dump_tuple (tuple);pr_debug ("seq=%u ack=%u sack =%u win=%u end=%u\n" , seq, ack, sack, win, end); -pr_debug ("tcp_in_window: sender end=%u maxend=%u maxwin=%u scale=%i " +pr_debug ("sender end=%u maxend=%u maxwin=%u scale=%i " "receiver end=%u maxend=%u maxwin=%u scale=%i\n" , sender->td_end, sender->td_maxend, sender->td_maxwin, sender->td_scale, receiver->td_end, receiver->td_maxend, receiver->td_maxwin, receiver->td_scale); - pr_debug("tcp_in_window: I=%i II=%i III=%i IV=%i\n", + pr_debug("I=%i II=%i III=%i IV=%i\n", before(seq, sender->td_maxend + 1), after(end, sender->td_end - receiver->td_maxwin - 1), before(sack, receiver->td_end + 1),
@@ -707,7 +709,7 @@ static bool tcp_in_window(const struct nf_conn *ct, : "SEQ is over the upper bound (over the window of the receiver)"); } -pr_debug ("tcp_in_window: res=%u sender end=%u maxend=%u maxwin=%u " +pr_debug ("res=%u sender end=%u maxend=%u maxwin=%u " "receiver end=%u maxend=%u maxwin=%u\n" , res, sender->td_end, sender->td_maxend, sender->td_maxwin, receiver->td_end, receiver->td_maxend, receiver->td_maxwin);
@@ -738,7 +740,7 @@ void nf_conntrack_tcp_update(const struct sk_buff *skb, ct->proto.tcp.seen[dir].td_end = end; ct->proto.tcp.last_end = end;spin_unlock_bh (&ct->lock); - pr_debug("tcp_update: sender end=%u maxend=%u maxwin=%u scale=%i " + pr_debug("sender end=%u maxend=%u maxwin=%u scale=%i " "receiver end=%u maxend=%u maxwin=%u scale=%i\n", sender->td_end, sender->td_maxend, sender->td_maxwin, sender->td_scale,
@@ -932,7 +934,7 @@ static int tcp_packet(struct nf_conn *ct,return NF_ACCEPT ;case TCP_CONNTRACK_MAX :/* Invalid packet */ -pr_debug ("nf_ct_tcp: Invalid dir=%i index=%u ostate=%u\n" , +pr_debug ("Invalid dir=%i index=%u ostate=%u\n" , dir,get_conntrack_index (th), old_state);spin_unlock_bh (&ct->lock);if (LOG_INVALID (net,IPPROTO_TCP ))
@@ -944,7 +946,9 @@ static int tcp_packet(struct nf_conn *ct, && (ct->proto.tcp.seen[!dir].flags & IP_CT_TCP_FLAG_MAXACK_SET) && before(ntohl(th->seq), ct->proto.tcp.seen[!dir].td_maxack)) {/* Invalid RST */ +#if 0 write_unlock_bh (&tcp_lock); +#endif if (LOG_INVALID (net,IPPROTO_TCP ))nf_log_packet (pf,0 , skb,NULL ,NULL ,NULL ,"nf_ct_tcp: invalid RST " );
@@ -983,7 +987,7 @@ static int tcp_packet(struct nf_conn *ct, ct->proto.tcp.last_index = index; ct->proto.tcp.last_dir = dir; -pr_debug ("tcp_conntracks: " ); +pr_debug ("" );nf_ct_dump_tuple (tuple); pr_debug("syn=%i ack=%i fin=%i rst=%i old=%i new=%i\n", (th->syn ? 1 : 0), (th->ack ? 1 : 0),
@@ -1053,7 +1057,7 @@ static bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb,/* Invalid: delete conntrack */ if (new_state >=TCP_CONNTRACK_MAX ) { -pr_debug ("nf_ct_tcp: invalid new deleting.\n" ); +pr_debug ("invalid new deleting.\n" );return false; }
@@ -1106,7 +1110,7 @@ static bool tcp_new(struct nf_conn *ct, const struct sk_buff *skb, ct->proto.tcp.state =TCP_CONNTRACK_NONE ; ct->proto.tcp.last_index =TCP_NONE_SET ; - pr_debug("tcp_new: sender end=%u maxend=%u maxwin=%u scale=%i " + pr_debug("sender end=%u maxend=%u maxwin=%u scale=%i " "receiver end=%u maxend=%u maxwin=%u scale=%i\n", sender->td_end, sender->td_maxend, sender->td_maxwin, sender->td_scale,
net/netfilter/nf_conntrack_sane.c +10 -10
@@ -17,6 +17,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/netfilter.h>
@@ -120,14 +122,14 @@ static int help(struct sk_buff *skb, ct_sane_info->state =SANE_STATE_NORMAL ;if (datalen <sizeof (struct sane_reply_net_start )) { -pr_debug ("nf_ct_sane: NET_START reply too short\n" ); +pr_debug ("NET_START reply too short\n" ); goto out; } reply = sb_ptr;if (reply->status !=htonl (SANE_STATUS_SUCCESS )) {/* saned refused the command */ -pr_debug ("nf_ct_sane: unsuccessful SANE_STATUS = %u\n" , +pr_debug ("unsuccessful SANE_STATUS = %u\n" ,ntohl (reply->status)); goto out; }
@@ -147,7 +149,7 @@ static int help(struct sk_buff *skb, &tuple->src.u3, &tuple->dst.u3, IPPROTO_TCP, NULL, &reply->port); -pr_debug ("nf_ct_sane: expect: " ); +pr_debug ("expect: " );nf_ct_dump_tuple (&exp->tuple);/* Can't expect this? Best to drop packet now. */
@@ -176,8 +178,7 @@ static void nf_conntrack_sane_fini(void)for (i =0 ; i < ports_c; i++) {for (j =0 ; j <2 ; j++) { -pr_debug ("nf_ct_sane: unregistering helper for pf: %d " -"port: %d\n" , +pr_debug ("unregistering helper for pf: %d port: %d\n" , sane[i][j].tuple.src.l3num, ports[i]);nf_conntrack_helper_unregister (&sane[i][j]); }
@@ -216,14 +217,13 @@ static int __init nf_conntrack_sane_init(void)sprintf (tmpname,"sane-%d" , ports[i]); sane[i][j].name = tmpname; -pr_debug ("nf_ct_sane: registering helper for pf: %d " -"port: %d\n" , +pr_debug ("registering helper for pf: %d port: %d\n" , sane[i][j].tuple.src.l3num, ports[i]); ret =nf_conntrack_helper_register (&sane[i][j]);if (ret) { -printk (KERN_ERR "nf_ct_sane: failed to " -"register helper for pf: %d port: %d\n" , - sane[i][j].tuple.src.l3num, ports[i]); +pr_err ("failed to register helper for pf: %d " +"port: %d\n" , + sane[i][j].tuple.src.l3num, ports[i]);nf_conntrack_sane_fini ();return ret; }
net/netfilter/nf_conntrack_sip.c +6 -4
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/ctype.h> #include <linux/skbuff.h>
@@ -172,7 +174,7 @@ static int epaddr_len(const struct nf_conn *ct, const char *dptr,const char *aux = dptr;if (!parse_addr (ct, dptr, &dptr, &addr, limit)) { -pr_debug ("ip: %s parse failed.!\n" , dptr); +pr_debug ("%s parse failed.!\n" , dptr);return 0 ; }
@@ -1363,9 +1365,9 @@ static int __init nf_conntrack_sip_init(void) ret =nf_conntrack_helper_register (&sip[i][j]);if (ret) { -printk ("nf_ct_sip: failed to register helper " -"for pf: %u port: %u\n" , - sip[i][j].tuple.src.l3num, ports[i]); +pr_info ("failed to register helper for pf: %u " +"port: %u\n" , + sip[i][j].tuple.src.l3num, ports[i]);nf_conntrack_sip_fini ();return ret; }
net/netfilter/nf_conntrack_standalone.c +3 -1
@@ -6,6 +6,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/types.h> #include <linux/netfilter.h> #include <linux/module.h>
@@ -445,7 +447,7 @@ out_kmemdup:if (net_eq (net, &init_net))unregister_sysctl_table (nf_ct_netfilter_header); out: -printk ("nf_conntrack: can't register to sysctl.\n" ); +pr_info ("can't register to sysctl.\n" );return -ENOMEM ; }
net/netfilter/nf_conntrack_tftp.c +4 -2
@@ -5,6 +5,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/moduleparam.h> #include <linux/in.h>
@@ -138,8 +140,8 @@ static int __init nf_conntrack_tftp_init(void) ret =nf_conntrack_helper_register (&tftp[i][j]);if (ret) { -printk ("nf_ct_tftp: failed to register helper " -"for pf: %u port: %u\n" , +pr_info ("failed to register helper for pf: %u " +"port: %u\n" , tftp[i][j].tuple.src.l3num, ports[i]);nf_conntrack_tftp_fini ();return ret;
net/netfilter/nf_tproxy_core.c +2 -0
@@ -10,6 +10,8 @@* */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/net.h>
net/netfilter/nfnetlink.c +5 -3
@@ -14,6 +14,8 @@* of the GNU General Public License, incorporated herein by reference. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/types.h> #include <linux/socket.h>
@@ -186,19 +188,19 @@ static void nfnetlink_rcv(struct sk_buff *skb) static void __exit nfnetlink_exit(void) { -printk ("Removing netfilter NETLINK layer.\n" ); +pr_info ("Removing netfilter NETLINK layer.\n" );netlink_kernel_release (nfnl);return ; }static int __init nfnetlink_init (void ) { -printk ("Netfilter messages via NETLINK v%s.\n" , nfversion); +pr_info ("Netfilter messages via NETLINK v%s.\n" , nfversion); nfnl =netlink_kernel_create (&init_net,NETLINK_NETFILTER ,NFNLGRP_MAX , nfnetlink_rcv,NULL ,THIS_MODULE );if (!nfnl) { -printk (KERN_ERR "cannot initialize nfnetlink!\n" ); +pr_err ("cannot initialize nfnetlink!\n" );return -ENOMEM ; }
net/netfilter/nfnetlink_log.c +6 -3
@@ -11,6 +11,9 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/init.h>
@@ -500,7 +503,7 @@ __build_packet_message(struct nfulnl_instance *inst,int size =nla_attr_size (data_len);if (skb_tailroom (inst->skb) <nla_total_size (data_len)) { -printk (KERN_WARNING "nfnetlink_log: no tailroom!\n" ); +pr_warning ("no tailroom!\n" ); goto nlmsg_failure; }
@@ -954,13 +957,13 @@ static int __init nfnetlink_log_init(void)netlink_register_notifier (&nfulnl_rtnl_notifier); status =nfnetlink_subsys_register (&nfulnl_subsys);if (status <0 ) { -printk (KERN_ERR "log: failed to create netlink socket\n" ); +pr_err ("failed to create netlink socket\n" ); goto cleanup_netlink_notifier; } status =nf_log_register (NFPROTO_UNSPEC , &nfulnl_logger);if (status <0 ) { -printk (KERN_ERR "log: failed to register logger\n" ); +pr_err ("failed to register logger\n" ); goto cleanup_subsys; }
net/netfilter/nfnetlink_queue.c +10 -8
@@ -14,6 +14,9 @@* published by the Free Software Foundation. * */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/init.h>
@@ -362,7 +365,7 @@ nfqnl_build_packet_message(struct nfqnl_instance *queue,int sz =nla_attr_size (data_len);if (skb_tailroom (skb) <nla_total_size (data_len)) { -printk (KERN_WARNING "nf_queue: no tailroom!\n" ); +pr_warning ("no tailroom!\n" ); goto nlmsg_failure; }
@@ -382,7 +385,7 @@ nla_put_failure:if (skb)kfree_skb (skb);if (net_ratelimit ()) -printk (KERN_ERR "nf_queue: error creating packet message\n" ); +pr_err ("error creating packet message\n" );return NULL ; }
@@ -413,9 +416,9 @@ nfqnl_enqueue_packet(struct nf_queue_entry *entry, unsigned int queuenum)if (queue->queue_total >= queue->queue_maxlen) { queue->queue_dropped++;if (net_ratelimit ()) -printk (KERN_WARNING "nf_queue: full at %d entries, " -"dropping packets(s). Dropped: %d\n" , - queue->queue_total, queue->queue_dropped); +pr_warning ("full at %d entries, dropping packets(s). " +"Dropped: %d\n" , + queue->queue_total, queue->queue_dropped); goto err_out_free_nskb; }
@@ -456,8 +459,7 @@ nfqnl_mangle(void *data, int data_len, struct nf_queue_entry *e) nskb =skb_copy_expand (e->skb,skb_headroom (e->skb), diff,GFP_ATOMIC );if (!nskb) { -printk (KERN_WARNING "nf_queue: OOM " -"in mangle, dropping packet\n" ); +pr_warning ("OOM in mangle, dropping packet\n" );return -ENOMEM ; }kfree_skb (e->skb);
@@ -901,7 +903,7 @@ static int __init nfnetlink_queue_init(void)netlink_register_notifier (&nfqnl_rtnl_notifier); status =nfnetlink_subsys_register (&nfqnl_subsys);if (status <0 ) { -printk (KERN_ERR "nf_queue: failed to create netlink socket\n" ); +pr_err ("failed to create netlink socket\n" ); goto cleanup_netlink_notifier; }
net/netfilter/xt_CONNMARK.c +10 -8
@@ -20,6 +20,9 @@* along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -118,19 +121,18 @@ static bool connmark_tg_check_v0(const struct xt_tgchk_param *par)if (matchinfo->mode ==XT_CONNMARK_RESTORE ) {if (strcmp (par->table,"mangle" ) !=0 ) { -printk (KERN_WARNING "CONNMARK: restore can only be " -"called from \"mangle\" table, not \"%s\"\n" , - par->table); +pr_warning ("restore can only be called from \"mangle\" table, not \"%s\"\n" , + par->table);return false; } }if (matchinfo->mark >0xffffffff || matchinfo->mask >0xffffffff ) { -printk (KERN_WARNING "CONNMARK: Only supports 32bit mark\n" ); +pr_warning ("Only supports 32bit mark\n" );return false; }if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; }return true;
@@ -139,8 +141,8 @@ static bool connmark_tg_check_v0(const struct xt_tgchk_param *par)static bool connmark_tg_check (const struct xt_tgchk_param *par) {if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "cannot load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("cannot load conntrack support for proto=%u\n" , + par->family);return false; }return true;
net/netfilter/xt_CONNSECMARK.c +8 -5
@@ -15,6 +15,9 @@* published by the Free Software Foundation. * */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter/x_tables.h>
@@ -91,8 +94,8 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"security" ) !=0 ) { - printk(KERN_INFO PFX "target only valid in the \'mangle\' " - "or \'security\' tables, not \'%s\'.\n", par->table); +pr_info (PFX "target only valid in the \'mangle\' " +"or \'security\' tables, not \'%s\'.\n" , par->table);return false; }
@@ -102,13 +105,13 @@ static bool connsecmark_tg_check(const struct xt_tgchk_param *par)break ;default : - printk(KERN_INFO PFX "invalid mode: %hu\n", info->mode); +pr_info (PFX "invalid mode: %hu\n" , info->mode);return false; }if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; }return true;
net/netfilter/xt_DSCP.c +4 -2
@@ -10,6 +10,8 @@* See RFC2474 for a description of the DSCP field within the IP Header. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -66,7 +68,7 @@ static bool dscp_tg_check(const struct xt_tgchk_param *par)const struct xt_DSCP_info *info = par->targinfo;if (info->dscp >XT_DSCP_MAX ) { -printk (KERN_WARNING "DSCP: dscp %x out of range\n" , info->dscp); +pr_warning ("dscp %x out of range\n" , info->dscp);return false; }return true;
@@ -100,7 +102,7 @@ static bool tos_tg_check_v0(const struct xt_tgchk_param *par)if (tos !=IPTOS_LOWDELAY && tos !=IPTOS_THROUGHPUT && tos !=IPTOS_RELIABILITY && tos !=IPTOS_MINCOST && tos !=IPTOS_NORMALSVC ) { -printk (KERN_WARNING "TOS: bad tos value %#x\n" , tos); +pr_warning ("bad tos value %#x\n" , tos);return false; }
net/netfilter/xt_HL.c +5 -6
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -106,8 +108,7 @@ static bool ttl_tg_check(const struct xt_tgchk_param *par)const struct ipt_TTL_info *info = par->targinfo;if (info->mode >IPT_TTL_MAXMODE ) { -printk (KERN_WARNING "ipt_TTL: invalid or unknown Mode %u\n" , - info->mode); +pr_warning ("invalid or unknown Mode %u\n" , info->mode);return false; }if (info->mode !=IPT_TTL_SET && info->ttl ==0 )
@@ -120,13 +121,11 @@ static bool hl_tg6_check(const struct xt_tgchk_param *par)const struct ip6t_HL_info *info = par->targinfo;if (info->mode >IP6T_HL_MAXMODE ) { -printk (KERN_WARNING "ip6t_HL: invalid or unknown Mode %u\n" , - info->mode); +pr_warning ("invalid or unknown Mode %u\n" , info->mode);return false; }if (info->mode !=IP6T_HL_SET && info->hop_limit ==0 ) { -printk (KERN_WARNING "ip6t_HL: increment/decrement doesn't " -"make sense with value 0\n" ); +pr_warning ("increment/decrement doesn't make sense with value 0\n" );return false; }return true;
net/netfilter/xt_LED.c +6 -6
@@ -19,6 +19,8 @@* */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter/x_tables.h>
@@ -87,13 +89,13 @@ static bool led_tg_check(const struct xt_tgchk_param *par)int err;if (ledinfo->id[0 ] =='\0' ) { - printk(KERN_ERR KBUILD_MODNAME ": No 'id' parameter given.\n"); +pr_err ("No 'id' parameter given.\n" );return false; } ledinternal =kzalloc (sizeof (struct xt_led_info_internal ),GFP_KERNEL );if (!ledinternal) { - printk(KERN_CRIT KBUILD_MODNAME ": out of memory\n"); +pr_crit ("out of memory\n" );return false; }
@@ -101,11 +103,9 @@ static bool led_tg_check(const struct xt_tgchk_param *par) err =led_trigger_register (&ledinternal->netfilter_led_trigger);if (err) { - printk(KERN_CRIT KBUILD_MODNAME - ": led_trigger_register() failed\n"); +pr_crit ("led_trigger_register() failed\n" );if (err == -EEXIST ) - printk(KERN_ERR KBUILD_MODNAME -": Trigger name is already in use.\n" ); +pr_err ("Trigger name is already in use.\n" ); goto exit_alloc; }
net/netfilter/xt_MARK.c +5 -4
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -71,7 +73,7 @@ static bool mark_tg_check_v0(const struct xt_tgchk_param *par)const struct xt_mark_target_info *markinfo = par->targinfo;if (markinfo->mark >0xffffffff ) { -printk (KERN_WARNING "MARK: Only supports 32bit wide mark\n" ); +pr_warning ("Only supports 32bit wide mark\n" );return false; }return true;
@@ -84,12 +86,11 @@ static bool mark_tg_check_v1(const struct xt_tgchk_param *par)if (markinfo->mode !=XT_MARK_SET && markinfo->mode !=XT_MARK_AND && markinfo->mode !=XT_MARK_OR ) { -printk (KERN_WARNING "MARK: unknown mode %u\n" , - markinfo->mode); +pr_warning ("unknown mode %u\n" , markinfo->mode);return false; }if (markinfo->mark >0xffffffff ) { -printk (KERN_WARNING "MARK: Only supports 32bit wide mark\n" ); +pr_warning ("Only supports 32bit wide mark\n" );return false; }return true;
net/netfilter/xt_SECMARK.c +13 -10
@@ -12,6 +12,9 @@* published by the Free Software Foundation. * */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/selinux.h>
@@ -59,20 +62,20 @@ static bool checkentry_selinux(struct xt_secmark_target_info *info) err =selinux_string_to_sid (sel->selctx, &sel->selsid);if (err) {if (err == -EINVAL ) - printk(KERN_INFO PFX "invalid SELinux context \'%s\'\n", - sel->selctx); +pr_info (PFX "invalid SELinux context \'%s\'\n" , + sel->selctx);return false; }if (!sel->selsid) { - printk(KERN_INFO PFX "unable to map SELinux context \'%s\'\n", - sel->selctx); +pr_info (PFX "unable to map SELinux context \'%s\'\n" , + sel->selctx);return false; } err =selinux_secmark_relabel_packet_permission (sel->selsid);if (err) { - printk(KERN_INFO PFX "unable to obtain relabeling permission\n"); +pr_info (PFX "unable to obtain relabeling permission\n" );return false; }
@@ -86,14 +89,14 @@ static bool secmark_tg_check(const struct xt_tgchk_param *par)if (strcmp (par->table,"mangle" ) !=0 &&strcmp (par->table,"security" ) !=0 ) { - printk(KERN_INFO PFX "target only valid in the \'mangle\' " - "or \'security\' tables, not \'%s\'.\n", par->table); +pr_info (PFX "target only valid in the \'mangle\' " +"or \'security\' tables, not \'%s\'.\n" , par->table);return false; }if (mode && mode != info->mode) { - printk(KERN_INFO PFX "mode already set to %hu cannot mix with " - "rules for mode %hu\n", mode, info->mode); +pr_info (PFX "mode already set to %hu cannot mix with " +"rules for mode %hu\n" , mode, info->mode);return false; }
@@ -104,7 +107,7 @@ static bool secmark_tg_check(const struct xt_tgchk_param *par)break ;default : - printk(KERN_INFO PFX "invalid mode: %hu\n", info->mode); +pr_info (PFX "invalid mode: %hu\n" , info->mode);return false; }
net/netfilter/xt_TCPMSS.c +11 -11
@@ -8,6 +8,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -67,23 +69,21 @@ tcpmss_mangle_packet(struct sk_buff *skb,badly. --RR */ if (tcplen != tcph->doff*4 ) {if (net_ratelimit ()) -printk (KERN_ERR "xt_TCPMSS: bad length (%u bytes)\n" , - skb->len); +pr_err ("bad length (%u bytes)\n" , skb->len);return -1 ; }if (info->mss ==XT_TCPMSS_CLAMP_PMTU ) {if (dst_mtu (skb_dst (skb)) <= minlen) {if (net_ratelimit ()) -printk (KERN_ERR "xt_TCPMSS: " -"unknown or invalid path-MTU (%u)\n" , +pr_err ("unknown or invalid path-MTU (%u)\n" ,dst_mtu (skb_dst (skb)));return -1 ; }if (in_mtu <= minlen) {if (net_ratelimit ()) -printk (KERN_ERR "xt_TCPMSS: unknown or " -"invalid path-MTU (%u)\n" , in_mtu); +pr_err ("unknown or invalid path-MTU (%u)\n" , + in_mtu);return -1 ; } newmss =min (dst_mtu (skb_dst (skb)), in_mtu) - minlen;
@@ -246,13 +246,13 @@ static bool tcpmss_tg4_check(const struct xt_tgchk_param *par) (par->hook_mask & ~((1 << NF_INET_FORWARD) | (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_POST_ROUTING))) != 0) { -printk ("xt_TCPMSS: path-MTU clamping only supported in " -"FORWARD, OUTPUT and POSTROUTING hooks\n" ); +pr_info ("path-MTU clamping only supported in " +"FORWARD, OUTPUT and POSTROUTING hooks\n" );return false; }if (IPT_MATCH_ITERATE (e, find_syn_match))return true; -printk ("xt_TCPMSS: Only works on TCP SYN packets\n" ); +pr_info ("Only works on TCP SYN packets\n" );return false; }
@@ -266,13 +266,13 @@ static bool tcpmss_tg6_check(const struct xt_tgchk_param *par) (par->hook_mask & ~((1 << NF_INET_FORWARD) | (1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_POST_ROUTING))) != 0) { -printk ("xt_TCPMSS: path-MTU clamping only supported in " +pr_info ("path-MTU clamping only supported in " "FORWARD, OUTPUT and POSTROUTING hooks\n" );return false; }if (IP6T_MATCH_ITERATE (e, find_syn_match))return true; -printk ("xt_TCPMSS: Only works on TCP SYN packets\n" ); +pr_info ("Only works on TCP SYN packets\n" ); return false; }#endif
net/netfilter/xt_cluster.c +6 -5
@@ -5,6 +5,9 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/jhash.h>
@@ -136,14 +139,12 @@ static bool xt_cluster_mt_checkentry(const struct xt_mtchk_param *par)struct xt_cluster_match_info *info = par->matchinfo;if (info->total_nodes >XT_CLUSTER_NODES_MAX ) { -printk (KERN_ERR "xt_cluster: you have exceeded the maximum " -"number of cluster nodes (%u > %u)\n" , - info->total_nodes,XT_CLUSTER_NODES_MAX ); +pr_err ("exceeded the maximum number of cluster nodes (%u > %u)\n" , + info->total_nodes,XT_CLUSTER_NODES_MAX );return false; }if (info->node_mask >= (1ULL << info->total_nodes)) { -printk (KERN_ERR "xt_cluster: this node mask cannot be " -"higher than the total number of nodes\n" ); +pr_err ("this node mask cannot be higher than the total number of nodes\n" );return false; }return true;
net/netfilter/xt_connbytes.c +5 -2
@@ -1,6 +1,9 @@/* Kernel module to match connection tracking byte counter. * GPL (C) 2002 Martin Devera ([email protected]). */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/bitops.h> #include <linux/skbuff.h>
@@ -107,8 +110,8 @@ static bool connbytes_mt_check(const struct xt_mtchk_param *par)return false;if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; }
net/netfilter/xt_connlimit.c +5 -2
@@ -12,6 +12,9 @@* Kernel module to match connection tracking information. * GPL (C) 1999 Rusty Russell ([email protected]). */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/in.h> #include <linux/in6.h> #include <linux/ip.h>
@@ -229,8 +232,8 @@ static bool connlimit_mt_check(const struct xt_mtchk_param *par)unsigned int i;if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "cannot load conntrack support for " -"address family %u\n" , par->family); +pr_warning ("cannot load conntrack support for address family %u\n" , + par->family);return false; }
net/netfilter/xt_connmark.c +7 -5
@@ -21,6 +21,8 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <net/netfilter/nf_conntrack.h>
@@ -66,12 +68,12 @@ static bool connmark_mt_check_v0(const struct xt_mtchk_param *par)const struct xt_connmark_info *cm = par->matchinfo;if (cm->mark >0xffffffff || cm->mask >0xffffffff ) { -printk (KERN_WARNING "connmark: only support 32bit mark\n" ); +pr_warning ("only support 32bit mark\n" );return false; }if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; }return true;
@@ -80,8 +82,8 @@ static bool connmark_mt_check_v0(const struct xt_mtchk_param *par)static bool connmark_mt_check (const struct xt_mtchk_param *par) {if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "cannot load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("cannot load conntrack support for proto=%u\n" , + par->family);return false; }return true;
net/netfilter/xt_conntrack.c +4 -2
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <net/ipv6.h>
@@ -281,8 +283,8 @@ conntrack_mt(const struct sk_buff *skb, const struct xt_match_param *par)static bool conntrack_mt_check (const struct xt_mtchk_param *par) {if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; }return true;
net/netfilter/xt_dscp.c +3 -1
@@ -7,6 +7,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
@@ -48,7 +50,7 @@ static bool dscp_mt_check(const struct xt_mtchk_param *par)const struct xt_dscp_info *info = par->matchinfo;if (info->dscp >XT_DSCP_MAX ) { -printk (KERN_ERR "xt_dscp: dscp %x out of range\n" , info->dscp); +pr_err ("dscp %x out of range\n" , info->dscp);return false; }
net/netfilter/xt_hashlimit.c +13 -14
@@ -7,6 +7,9 @@* * Development of this code was funded by Astaro AG, http://www.astaro.com/ */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/spinlock.h> #include <linux/random.h>
@@ -156,17 +159,15 @@ dsthash_alloc_init(struct xt_hashlimit_htable *ht,if (ht->cfg.max && ht->count >= ht->cfg.max) {/* FIXME: do something. question is what.. */ if (net_ratelimit ()) -printk (KERN_WARNING -"xt_hashlimit: max count of %u reached\n" , - ht->cfg.max); +pr_warning ("max count of %u reached\n" , + ht->cfg.max);return NULL ; } ent =kmem_cache_alloc (hashlimit_cachep,GFP_ATOMIC );if (!ent) {if (net_ratelimit ()) -printk (KERN_ERR -"xt_hashlimit: can't allocate dsthash_ent\n" ); +pr_err ("can't allocate dsthash_ent\n" );return NULL ; }memcpy (&ent->dst, dst,sizeof (ent->dst));
@@ -205,7 +206,7 @@ static int htable_create_v0(struct xt_hashlimit_info *minfo, u_int8_t family) hinfo =vmalloc (sizeof (struct xt_hashlimit_htable ) +sizeof (struct list_head ) * size);if (!hinfo) { -printk (KERN_ERR "xt_hashlimit: unable to create hashtable\n" ); +pr_err ("unable to create hashtable\n" );return -1 ; } minfo->hinfo = hinfo;
@@ -277,7 +278,7 @@ static int htable_create(struct xt_hashlimit_mtinfo1 *minfo, u_int8_t family) hinfo =vmalloc (sizeof (struct xt_hashlimit_htable ) +sizeof (struct list_head ) * size);if (hinfo ==NULL ) { -printk (KERN_ERR "xt_hashlimit: unable to create hashtable\n" ); +pr_err ("unable to create hashtable\n" );return -1 ; } minfo->hinfo = hinfo;
@@ -670,7 +671,7 @@ static bool hashlimit_mt_check_v0(const struct xt_mtchk_param *par)/* Check for overflow. */ if (r->cfg.burst ==0 ||user2credits (r->cfg.avg * r->cfg.burst) <user2credits (r->cfg.avg)) { -printk (KERN_ERR "xt_hashlimit: overflow, try lower: %u/%u\n" , +pr_err ("overflow, try lower: %u/%u\n" , r->cfg.avg, r->cfg.burst);return false; }
@@ -712,7 +713,7 @@ static bool hashlimit_mt_check(const struct xt_mtchk_param *par)if (info->cfg.burst ==0 ||user2credits (info->cfg.avg * info->cfg.burst) <user2credits (info->cfg.avg)) { -printk (KERN_ERR "xt_hashlimit: overflow, try lower: %u/%u\n" , +pr_err ("overflow, try lower: %u/%u\n" , info->cfg.avg, info->cfg.burst);return false; }
@@ -971,21 +972,19 @@ static int __init hashlimit_mt_init(void)sizeof (struct dsthash_ent ),0 ,0 , NULL);if (!hashlimit_cachep) { -printk (KERN_ERR "xt_hashlimit: unable to create slab cache\n" ); +pr_err ("unable to create slab cache\n" ); goto err2; } hashlimit_procdir4 =proc_mkdir ("ipt_hashlimit" , init_net.proc_net);if (!hashlimit_procdir4) { -printk (KERN_ERR "xt_hashlimit: unable to create proc dir " -"entry\n" ); +pr_err ("unable to create proc dir entry\n" ); goto err3; } err =0 ;#if defined(CONFIG_IP6_NF_IPTABLES ) || defined(CONFIG_IP6_NF_IPTABLES_MODULE ) hashlimit_procdir6 =proc_mkdir ("ip6t_hashlimit" , init_net.proc_net);if (!hashlimit_procdir6) { -printk (KERN_ERR "xt_hashlimit: unable to create proc dir " -"entry\n" ); +pr_err ("unable to create proc dir entry\n" ); err = -ENOMEM ; }#endif
net/netfilter/xt_helper.c +4 -2
@@ -7,6 +7,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter.h>
@@ -59,8 +61,8 @@ static bool helper_mt_check(const struct xt_mtchk_param *par)struct xt_helper_info *info = par->matchinfo;if (nf_ct_l3proto_try_module_get (par->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->family);return false; } info->name[29 ] ='\0' ;
net/netfilter/xt_hl.c +4 -4
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/ip.h> #include <linux/ipv6.h> #include <linux/module.h>
@@ -40,8 +42,7 @@ static bool ttl_mt(const struct sk_buff *skb, const struct xt_match_param *par)case IPT_TTL_GT :return ttl > info->ttl;default : -printk (KERN_WARNING "ipt_ttl: unknown mode %d\n" , - info->mode); +pr_warning ("unknown mode %d\n" , info->mode);return false; }
@@ -67,8 +68,7 @@ static bool hl_mt6(const struct sk_buff *skb, const struct xt_match_param *par)return ip6h->hop_limit > info->hop_limit;break ;default : -printk (KERN_WARNING "ip6t_hl: unknown mode %d\n" , - info->mode); +pr_warning ("unknown mode %d\n" , info->mode);return false; }
net/netfilter/xt_iprange.c +3 -0
@@ -8,6 +8,9 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/ip.h>
net/netfilter/xt_limit.c +4 -2
@@ -6,6 +6,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/spinlock.h>
@@ -105,8 +107,8 @@ static bool limit_mt_check(const struct xt_mtchk_param *par)/* Check for overflow. */ if (r->burst ==0 ||user2credits (r->avg * r->burst) <user2credits (r->avg)) { -printk ("Overflow in xt_limit, try lower: %u/%u\n" , - r->avg, r->burst); +pr_info ("Overflow in xt_limit, try lower: %u/%u\n" , + r->avg, r->burst);return false; }
net/netfilter/xt_mark.c +3 -1
@@ -10,6 +10,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h>
@@ -43,7 +45,7 @@ static bool mark_mt_check_v0(const struct xt_mtchk_param *par)const struct xt_mark_info *minfo = par->matchinfo;if (minfo->mark >0xffffffff || minfo->mask >0xffffffff ) { -printk (KERN_WARNING "mark: only supports 32bit mark\n" ); +pr_warning ("only supports 32bit mark\n" );return false; }return true;
net/netfilter/xt_osf.c +5 -3
@@ -17,6 +17,8 @@* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/kernel.h>
@@ -379,14 +381,14 @@ static int __init xt_osf_init(void) err =nfnetlink_subsys_register (&xt_osf_nfnetlink);if (err <0 ) { -printk (KERN_ERR "Failed (%d) to register OSF nsfnetlink helper.\n" , err); +pr_err ("Failed (%d) to register OSF nsfnetlink helper.\n" , err); goto err_out_exit; } err =xt_register_match (&xt_osf_match);if (err) { -printk (KERN_ERR "Failed (%d) to register OS fingerprint " -"matching module.\n" , err); +pr_err ("Failed (%d) to register OS fingerprint matching module.\n" , + err); goto err_out_remove; }
net/netfilter/xt_owner.c +5 -5
@@ -11,6 +11,9 @@* it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/file.h>
@@ -112,9 +115,7 @@ static bool owner_mt_check_v0(const struct xt_mtchk_param *par)const struct ipt_owner_info *info = par->matchinfo;if (info->match & (IPT_OWNER_PID |IPT_OWNER_SID |IPT_OWNER_COMM )) { - printk(KERN_WARNING KBUILD_MODNAME -": PID, SID and command matching is not " - "supported anymore\n"); +pr_warning ("PID, SID and command matching is not supported anymore\n" );return false; }
@@ -126,8 +127,7 @@ static bool owner_mt6_check_v0(const struct xt_mtchk_param *par)const struct ip6t_owner_info *info = par->matchinfo;if (info->match & (IP6T_OWNER_PID |IP6T_OWNER_SID )) { - printk(KERN_WARNING KBUILD_MODNAME - ": PID and SID matching is not supported anymore\n"); +pr_warning ("PID and SID matching is not supported anymore\n" );return false; }
net/netfilter/xt_physdev.c +5 -3
@@ -8,6 +8,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter_bridge.h>
@@ -95,9 +97,9 @@ static bool physdev_mt_check(const struct xt_mtchk_param *par) info->invert & XT_PHYSDEV_OP_BRIDGED) && par->hook_mask & ((1 << NF_INET_LOCAL_OUT) | (1 << NF_INET_FORWARD) | (1 << NF_INET_POST_ROUTING))) { -printk (KERN_WARNING "physdev match: using --physdev-out in the " -"OUTPUT, FORWARD and POSTROUTING chains for non-bridged " -"traffic is not supported anymore.\n" ); +pr_warning ("using --physdev-out in the " +"OUTPUT, FORWARD and POSTROUTING chains for non-bridged " +"traffic is not supported anymore.\n" );if (par->hook_mask & (1 <<NF_INET_LOCAL_OUT ))return false; }
net/netfilter/xt_policy.c +6 -7
@@ -7,6 +7,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/kernel.h> #include <linux/module.h> #include <linux/skbuff.h>
@@ -133,24 +135,21 @@ static bool policy_mt_check(const struct xt_mtchk_param *par)const struct xt_policy_info *info = par->matchinfo;if (!(info->flags & (XT_POLICY_MATCH_IN |XT_POLICY_MATCH_OUT ))) { -printk (KERN_ERR "xt_policy: neither incoming nor " -"outgoing policy selected\n" ); +pr_err ("neither incoming nor outgoing policy selected\n" );return false; }if (par->hook_mask & ((1 <<NF_INET_PRE_ROUTING ) | (1 <<NF_INET_LOCAL_IN )) && info->flags &XT_POLICY_MATCH_OUT ) { -printk (KERN_ERR "xt_policy: output policy not valid in " -"PRE_ROUTING and INPUT\n" ); +pr_err ("output policy not valid in PRE_ROUTING and INPUT\n" );return false; }if (par->hook_mask & ((1 <<NF_INET_POST_ROUTING ) | (1 <<NF_INET_LOCAL_OUT )) && info->flags &XT_POLICY_MATCH_IN ) { -printk (KERN_ERR "xt_policy: input policy not valid in " -"POST_ROUTING and OUTPUT\n" ); +pr_err ("input policy not valid in POST_ROUTING and OUTPUT\n" );return false; }if (info->len >XT_POLICY_MAX_ELEM ) { -printk (KERN_ERR "xt_policy: too many policy elements\n" ); +pr_err ("too many policy elements\n" );return false; }return true;
net/netfilter/xt_recent.c +7 -5
@@ -12,6 +12,9 @@* Author: Stephen Frost <[email protected]> * Copyright 2002-2003, Stephen Frost, 2.5.x port by [email protected] */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/init.h> #include <linux/ip.h> #include <linux/ipv6.h>
@@ -459,8 +462,8 @@ static int recent_old_seq_open(struct inode *inode, struct file *filp)static bool warned_of_old;if (unlikely (!warned_of_old)) { - printk(KERN_INFO KBUILD_MODNAME ": Use of /proc/net/ipt_recent" - " is deprecated; use /proc/net/xt_recent.\n"); +pr_info ("Use of /proc/net/ipt_recent is deprecated; " +"use /proc/net/xt_recent.\n" ); warned_of_old = true; }return recent_seq_open (inode, filp);
@@ -568,7 +571,7 @@ recent_mt_proc_write(struct file *file, const char __user *input, add = true;break ;default : - printk(KERN_INFO KBUILD_MODNAME ": Need +ip, -ip or /\n"); +pr_info ("Need +ip, -ip or /\n" );return -EINVAL ; }
@@ -583,8 +586,7 @@ recent_mt_proc_write(struct file *file, const char __user *input, }if (!succ) { - printk(KERN_INFO KBUILD_MODNAME ": illegal address written " - "to procfs\n"); +pr_info ("illegal address written to procfs\n" );return -EINVAL ; }
net/netfilter/xt_socket.c +3 -2
@@ -10,6 +10,8 @@* */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <linux/netfilter/x_tables.h>
@@ -165,8 +167,7 @@ socket_match(const struct sk_buff *skb, const struct xt_match_param *par, sk =NULL ; } -pr_debug ("socket match: proto %u %08x:%u -> %08x:%u " -"(orig %08x:%u) sock %p\n" , +pr_debug ("proto %u %08x:%u -> %08x:%u (orig %08x:%u) sock %p\n" , protocol,ntohl (saddr),ntohs (sport),ntohl (daddr),ntohs (dport),ntohl (iph->daddr), hp ?ntohs (hp->dest) :0 , sk);
net/netfilter/xt_state.c +4 -2
@@ -8,6 +8,8 @@* published by the Free Software Foundation. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/module.h> #include <linux/skbuff.h> #include <net/netfilter/nf_conntrack.h>
@@ -40,8 +42,8 @@ state_mt(const struct sk_buff *skb, const struct xt_match_param *par)static bool state_mt_check (const struct xt_mtchk_param *par) {if (nf_ct_l3proto_try_module_get (par->match->family) <0 ) { -printk (KERN_WARNING "can't load conntrack support for " -"proto=%u\n" , par->match->family); +pr_warning ("can't load conntrack support for proto=%u\n" , + par->match->family);return false; }return true;
net/netfilter/xt_statistic.c +3 -1
@@ -8,6 +8,8 @@* Based on ipt_random and ipt_nth by Fabrice MARIE <[email protected]>. */ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/init.h> #include <linux/spinlock.h> #include <linux/skbuff.h>
@@ -62,7 +64,7 @@ static bool statistic_mt_check(const struct xt_mtchk_param *par) info->master =kzalloc (sizeof (*info->master),GFP_KERNEL );if (info->master ==NULL ) { - printk(KERN_ERR KBUILD_MODNAME ": Out of memory\n"); +pr_err ("Out of memory\n" );return false; } info->master->count = info->u.nth.count;
net/netfilter/xt_time.c +8 -8
@@ -10,6 +10,9 @@* This file is distributed under the terms of the GNU General Public * License (GPL). Copies of the GPL can be obtained from gnu.org/gpl. */ + +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__ +#include <linux/ktime.h> #include <linux/module.h> #include <linux/skbuff.h>
@@ -224,8 +227,7 @@ static bool time_mt_check(const struct xt_mtchk_param *par)if (info->daytime_start >XT_TIME_MAX_DAYTIME || info->daytime_stop >XT_TIME_MAX_DAYTIME ) { -printk (KERN_WARNING "xt_time: invalid argument - start or " -"stop time greater than 23:59:59\n" ); +pr_warning ("invalid argument - start or stop time greater than 23:59:59\n" );return false; }
@@ -246,13 +248,11 @@ static int __init time_mt_init(void)int minutes = sys_tz.tz_minuteswest;if (minutes <0 )/* east of Greenwich */ - printk(KERN_INFO KBUILD_MODNAME -": kernel timezone is +%02d%02d\n" , - -minutes /60 , -minutes %60 ); +pr_info ("kernel timezone is +%02d%02d\n" , + -minutes /60 , -minutes %60 );else /* west of Greenwich */ - printk(KERN_INFO KBUILD_MODNAME -": kernel timezone is -%02d%02d\n" , - minutes /60 , minutes %60 ); +pr_info ("kernel timezone is -%02d%02d\n" , + minutes /60 , minutes %60 );return xt_register_match (&xt_time_mt_reg); }
Signature · 1 line
1.6.3.1.10.g659a0.dirty
PATCH 3/3 netfilter h323_asn1.c: convert PRINT to pr_info
In reply to Joe Perchesonly for #ifdef __KERNEL__ codepath
Signed-off-by Joe Perches <[email protected]>
--- net/netfilter/nf_conntrack_h323_asn1.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
net/netfilter/nf_conntrack_h323_asn1.c +2 -1
@@ -11,6 +11,7 @@****************************************************************************/ #ifdef __KERNEL__ +#define pr_fmt (fmt) "%s:%s: " fmt, KBUILD_MODNAME, __func__#include <linux/kernel.h> #else #include <stdio.h>
@@ -26,7 +27,7 @@#define TAB_SIZE 4#define IFTHEN (cond, act) if(cond){act;}#ifdef __KERNEL__ -#define #define #else #define #endif
Signature · 1 line
1.6.3.1.10.g659a0.dirty
Quoted 8 lines · Joe Perches
Many of the calls to netfilter printk calls do not have KERN_<level> prefixes.
Convert printks with KERN_<level> to pr_<level>
and usepr_infofor unprefixed printks.Remove the function names in printk strings and add #define
pr_fmt(fmt)"%s:%s " fmt,KBUILD_MODNAME,__func__
Hm I had wished there was a better way than to replicate this define over all Netfilter files.
Perhaps stuff it into an include.
Quoted 4 lines · Jan Engelhardt
Quoted 2 lines · Joe Perches
Many of the [wretched grammar removed] netfilter printk calls do not have KERN_<level> prefixes.
[]
Quoted 6 lines
Quoted 2 lines
Remove the function names in printk strings and add #define
pr_fmt(fmt)"%s:%s " fmt,KBUILD_MODNAME,__func__Hm I had wished there was a better way than to replicate this define over all Netfilter files.
Perhaps stuff it into an include.
Maybe standardize the netfilter includes a bit later?
Patrick, is this patch set concept acceptable at all?
Patrick McHardy
AppliedRe: [PATCH 1/3] x_tables: Convert printk to pr_err
In reply to Joe PerchesQuoted 1 line · Joe Perches
Signed-off-by Joe Perches <[email protected]>
Applied, thanks.
Re: [PATCH 2/3] net/netfilter: Convert printk uses to pr_<level>
In reply to Joe PerchesQuoted 2 lines · Joe Perches
Remove function names from format strings
Add #definepr_fmt(fmt)"%s:%s: " fmt,KBUILD_MODNAME,__func__
In my opinion a lot of the debugging messages should simply be removed, they provide little informational value and decrease readability of the code. Unfortunately I couldn't convince everyone of that.
net/netfilter/nf_conntrack_acct.c int nf_conntrack_acct_init(struct net *net) · line 122
Quoted 7 lines
#ifdef
CONFIG_NF_CT_ACCTnet/netfilter/nf_conntrack_acct.c +3
-3-printk (KERN_WARNING "CONFIG_NF_CT_ACCT is deprecated and will be removed soon. Please use\n" ); -printk (KERN_WARNING "nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack module option or\n" ); -printk (KERN_WARNING "sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n" ); +pr_warning ("CONFIG_NF_CT_ACCT is deprecated and will be removed soon.\n" ); +pr_warning ("Please use nf_conntrack.acct=1 kernel parameter, acct=1 nf_conntrack\n" ); +pr_warning ("module option or sysctl net.netfilter.nf_conntrack_acct=1 to enable it.\n" );
For non-debugging messages that should provide enough information to make sense of them without function names, this change does not make much sense in my opinion.
Instead of a half-way readable message, we now would get:
nf_conntrack: nf_conntrack_acct_init: CONFIG_NF_CT_ACCT is deprecated ...
which is not an improvement at all. So unless we can limit this to debugging message, I'll pass on this change.
Re: [PATCH 2/3] net/netfilter: Convert printk uses to pr_<level>
Quoted 8 lines · Patrick McHardy
Quoted 2 lines · Joe Perches
Remove function names from format strings
Add #definepr_fmt(fmt)"%s:%s: " fmt,KBUILD_MODNAME,__func__For non-debugging messages that should provide enough information to make sense of them without function names, this change does not make much sense in my opinion.
Quoted 6 lines
Instead of a half-way readable message, we now would get:
nf_conntrack:nf_conntrack_acct_init:CONFIG_NF_CT_ACCTis deprecated ...which is not an improvement at all. So unless we can limit this to debugging message, I'll pass on this change.
Good point.
Maybe there should be a #define pr_dbg_fmt(fmt) <foo>
Perhaps:
include/linux/kernel.h +8 -4
@@ -360,6 +360,10 @@ static inline char *pack_hex_byte(char *buf, u8 byte)#define pr_fmt (fmt) fmt#endif +#ifndef pr_dbg_fmt +#define pr_dbg_fmt (fmt) pr_fmt(fmt) +#endif +#define pr_emerg (fmt, ...) \ printk(KERN_EMERG pr_fmt(fmt), ##__VA_ARGS__)#define pr_alert (fmt, ...) \
@@ -380,16 +384,16 @@ static inline char *pack_hex_byte(char *buf, u8 byte)/* pr_devel() should produce zero code unless DEBUG is defined */ #ifdef DEBUG #define pr_devel (fmt, ...) \ - printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_DEBUG pr_dbg_fmt(fmt), ##__VA_ARGS__)#else #define pr_devel (fmt, ...) \ - ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; }) + ({ if (0) printk(KERN_DEBUG pr_dbg_fmt(fmt), ##__VA_ARGS__); 0; })#endif /* If you are writing a driver, please use dev_dbg instead */ #if defined(DEBUG )#define pr_debug (fmt, ...) \ - printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__) + printk(KERN_DEBUG pr_dbg_fmt(fmt), ##__VA_ARGS__)#elif defined(CONFIG_DYNAMIC_DEBUG )/* dynamic_pr_debug() uses pr_fmt() internally so we don't need it here */ #define pr_debug (fmt, ...) do { \
@@ -397,7 +401,7 @@ static inline char *pack_hex_byte(char *buf, u8 byte) } while (0)#else #define pr_debug (fmt, ...) \ - ({ if (0) printk(KERN_DEBUG pr_fmt(fmt), ##__VA_ARGS__); 0; }) + ({ if (0) printk(KERN_DEBUG pr_dbg_fmt(fmt), ##__VA_ARGS__); 0; })#endif /*