anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-12 23:54:59 +02:00
Code Issues Releases Wiki Activity

pknock: replace printks by pr_debug

Browse Source 
The printk calls were protected using #if DEBUG anyway, so they can
just be changed to pr_debug. pr_debug also depends on #if DEBUG, and
takes care of the module prefix.
This commit is contained in:
Jan Rafaj
2009-09-01 19:52:48 +02:00
committed by Jan Engelhardt
parent 1de82a88a1
commit 19067393b6
1 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
extensions/xt_pknock.c
View File

@@ -8,6 +8,7 @@
* *
* This program is released under the terms of GNU GPL version 2. * This program is released under the terms of GNU GPL version 2.
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
@@ -53,7 +54,7 @@ enum {
"(S) peer: %u.%u.%u.%u - %s.\n", \ "(S) peer: %u.%u.%u.%u - %s.\n", \
NIPQUAD((peer)->ip), msg) NIPQUAD((peer)->ip), msg)
#else #else
#define DEBUGP(msg, peer) #define DEBUGP(msg, peer) do {} while (false);
#endif #endif
static uint32_t ipt_pknock_hash_rnd; static uint32_t ipt_pknock_hash_rnd;
@@ -385,15 +386,13 @@ add_rule(struct ipt_pknock *info)
if (rulecmp(info, rule) == 0) { if (rulecmp(info, rule) == 0) {
rule->ref_count++; rule->ref_count++;
#if DEBUG
if (info->option & IPT_PKNOCK_CHECKIP) { if (info->option & IPT_PKNOCK_CHECKIP) {
printk(KERN_DEBUG PKNOCK "add_rule() (AC)" pr_debug("add_rule() (AC)"
" rule found: %s - " " rule found: %s - "
"ref_count: %d\n", "ref_count: %d\n",
rule->rule_name, rule->rule_name,
rule->ref_count); rule->ref_count);
} }
#endif
return true; return true;
} }
} }
@@ -433,9 +432,7 @@ add_rule(struct ipt_pknock *info)
rule->status_proc->data = rule; rule->status_proc->data = rule;
list_add(&rule->head, &rule_hashtable[hash]); list_add(&rule->head, &rule_hashtable[hash]);
#if DEBUG pr_debug("(A) rule_name: %s - created.\n", rule->rule_name);
printk(KERN_INFO PKNOCK "(A) rule_name: %s - created.\n", rule->rule_name);
#endif
return true; return true;
} }
@@ -467,9 +464,7 @@ remove_rule(struct ipt_pknock *info)
} }
} }
if (!found) { if (!found) {
#if DEBUG pr_debug("(N) rule not found: %s.\n", info->rule_name);
printk(KERN_INFO PKNOCK "(N) rule not found: %s.\n", info->rule_name);
#endif
return; return;
} }
if (rule && rule->ref_count == 0) { if (rule && rule->ref_count == 0) {
@@ -485,9 +480,7 @@ remove_rule(struct ipt_pknock *info)
if (rule->status_proc) if (rule->status_proc)
remove_proc_entry(info->rule_name, pde); remove_proc_entry(info->rule_name, pde);
#if DEBUG pr_debug("(D) rule deleted: %s.\n", rule->rule_name);
printk(KERN_INFO PKNOCK "(D) rule deleted: %s.\n", rule->rule_name);
#endif
if (timer_pending(&rule->timer)) if (timer_pending(&rule->timer))
del_timer(&rule->timer); del_timer(&rule->timer);
@@ -758,9 +751,7 @@ has_secret(unsigned char *secret, int secret_len, uint32_t ipsrc,
crypt_to_hex(hexresult, result, crypto.size); crypt_to_hex(hexresult, result, crypto.size);
if (memcmp(hexresult, payload, hexa_size) != 0) { if (memcmp(hexresult, payload, hexa_size) != 0) {
#if DEBUG pr_debug("secret match failed\n");
printk(KERN_INFO PKNOCK "secret match failed\n");
#endif
goto out; goto out;
} }
@@ -859,13 +850,11 @@ update_peer(struct peer *peer, const struct ipt_pknock *info,
time = jiffies/HZ; time = jiffies/HZ;
if (is_time_exceeded(peer, info->max_time)) { if (is_time_exceeded(peer, info->max_time)) {
#if DEBUG
DEBUGP("TIME EXCEEDED", peer); DEBUGP("TIME EXCEEDED", peer);
DEBUGP("DESTROYED", peer); DEBUGP("DESTROYED", peer);
printk(KERN_INFO PKNOCK "max_time: %ld - time: %ld\n", pr_debug("max_time: %ld - time: %ld\n",
peer->timestamp + info->max_time, peer->timestamp + info->max_time,
time); time);
#endif
remove_peer(peer); remove_peer(peer);
return false; return false;
} }
@@ -986,9 +975,8 @@ static bool pknock_mt(const struct sk_buff *skb,
} }
out: out:
#if DEBUG if (ret != 0)
if (ret) DEBUGP("PASS OK", peer); DEBUGP("PASS OK", peer);
#endif
spin_unlock_bh(&list_lock); spin_unlock_bh(&list_lock);
return ret; return ret;
} }