Staging: batman-adv: replace internal logging mechanism.
authorAndrew Lunn <andrew@lunn.ch>
Sat, 12 Dec 2009 22:39:41 +0000 (23:39 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 4 Mar 2010 00:42:29 +0000 (16:42 -0800)
batman-adv used its own logging infrastructure. Replace this with
standard kernel logging, printk(), with compile time and runtime
options to enable/disable different debug levels.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
15 files changed:
drivers/staging/batman-adv/Makefile
drivers/staging/batman-adv/README
drivers/staging/batman-adv/bitarray.c
drivers/staging/batman-adv/device.c
drivers/staging/batman-adv/hard-interface.c
drivers/staging/batman-adv/log.c [deleted file]
drivers/staging/batman-adv/log.h [deleted file]
drivers/staging/batman-adv/main.c
drivers/staging/batman-adv/main.h
drivers/staging/batman-adv/proc.c
drivers/staging/batman-adv/routing.c
drivers/staging/batman-adv/send.c
drivers/staging/batman-adv/soft-interface.c
drivers/staging/batman-adv/translation-table.c
drivers/staging/batman-adv/vis.c

index 02da871..64bdb78 100644 (file)
@@ -19,4 +19,4 @@
 #
 
 obj-m += batman-adv.o
-batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o log.o
+batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o
index 3aaf393..6c62482 100644 (file)
@@ -1,4 +1,4 @@
-[state: 07-11-2009]
+[state: 13-11-2009]
 
 BATMAN-ADV
 ----------
@@ -96,6 +96,54 @@ To deactivate batman, do:
 
 # echo "" > /proc/net/batman-adv/interfaces
 
+LOGGING/DEBUGGING
+-----------------
+
+All error messages, warnings and information messages are sent to the
+kernel log. Depending on your operating system distribution this can be
+read in one of a number of ways. Try using the commands: dmesg,
+logread, or looking in the files /var/log/kern.log or
+/var/log/syslog. All batman-adv messages are prefixed with
+"batman-adv:" So to see just these messages try
+
+dmesg | grep batman-adv
+
+When investigating problems with your mesh network it is sometimes
+necessary to see more detail debug messages. This must be enabled when
+compiling the batman-adv module. When building batman-adv as part of
+kernel, use "make menuconfig" and enable the option
+"B.A.T.M.A.N. debugging". When compiling outside of the kernel tree it
+is necessary to edit the file Makefile.kbuild and uncomment the line
+
+#EXTRA_CFLAGS += -DCONFIG_BATMAN_DEBUG
+
+The additional debug output is by default disabled. It can be enabled
+either at kernel modules load time or during run time. To enable debug
+output at module load time, add the module parameter debug=<value>.
+<value> can take one of four values.
+
+0 - All debug output disabled
+1 - Enable messages related to routing / flooding / broadcasting
+2 - Enable route or hna added / changed / deleted
+3 - Enable all messages
+
+e.g.
+
+modprobe batman-adv debug=2
+
+will load the module and enable debug messages for when routes or HNAs
+change.
+
+The debug output can also be changed at runtime using the file
+/sys/module/batman-adv/parameters/debug. e.g.
+
+echo 2 > /sys/module/batman-adv/parameters/debug
+
+enables debug messages for when routes or HNAs
+
+The debug output is sent to the kernel logs. So try dmesg, logread etc
+to see the debug messages.
+
 BATCTL
 ------
 
index 3c67f5f..212eef9 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "bitarray.h"
-#include "log.h"
 
 /* returns true if the corresponding bit in the given seq_bits indicates true
  * and curr_seqno is within range of last_seqno */
@@ -80,8 +79,8 @@ void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n)
                 * from.
                 *
                 * left is high, right is low: FEDC BA98 7654 3210
-                *                                        ^^ ^^
-                *                             vvvv
+                *                                        ^^ ^^
+                *                             vvvv
                 * ^^^^ = from, vvvvv =to, we'd have word_num==1 and
                 * word_offset==WORD_BIT_SIZE/2 ????? in this example.
                 * (=24 bits)
@@ -133,13 +132,13 @@ char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff,
            (seq_num_diff < -TQ_LOCAL_WINDOW_SIZE)) {
 
                if (seq_num_diff > TQ_LOCAL_WINDOW_SIZE)
-                       debug_log(LOG_TYPE_BATMAN,
-                                 "We missed a lot of packets (%i) !\n",
-                                 seq_num_diff-1);
+                       bat_dbg(DBG_BATMAN,
+                               "We missed a lot of packets (%i) !\n",
+                               seq_num_diff-1);
 
                if (-seq_num_diff > TQ_LOCAL_WINDOW_SIZE)
-                       debug_log(LOG_TYPE_BATMAN,
-                                 "Other host probably restarted !\n");
+                       bat_dbg(DBG_BATMAN,
+                               "Other host probably restarted !\n");
 
                for (i = 0; i < NUM_WORDS; i++)
                        seq_bits[i] = 0;
index 1e7d1f8..12f2de9 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "device.h"
-#include "log.h"
 #include "send.h"
 #include "types.h"
 #include "hash.h"
@@ -60,7 +59,7 @@ int bat_device_setup(void)
        /* register our device - kernel assigns a free major number */
        tmp_major = register_chrdev(0, DRIVER_DEVICE, &fops);
        if (tmp_major < 0) {
-               debug_log(LOG_TYPE_WARN, "Registering the character device failed with %d\n",
+               printk(KERN_ERR "batman-adv:Registering the character device failed with %d\n",
                          tmp_major);
                return 0;
        }
@@ -68,7 +67,7 @@ int bat_device_setup(void)
        batman_class = class_create(THIS_MODULE, "batman-adv");
 
        if (IS_ERR(batman_class)) {
-               debug_log(LOG_TYPE_WARN, "Could not register class 'batman-adv' \n");
+               printk(KERN_ERR "batman-adv:Could not register class 'batman-adv' \n");
                return 0;
        }
 
@@ -111,7 +110,7 @@ int bat_device_open(struct inode *inode, struct file *file)
        }
 
        if (device_client_hash[i] != device_client) {
-               debug_log(LOG_TYPE_WARN, "Error - can't add another packet client: maximum number of clients reached \n");
+               printk(KERN_ERR "batman-adv:Error - can't add another packet client: maximum number of clients reached \n");
                kfree(device_client);
                return -EXFULL;
        }
@@ -208,7 +207,7 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
        struct batman_if *batman_if;
 
        if (len < sizeof(struct icmp_packet)) {
-               debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: invalid packet size\n");
+               printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: invalid packet size\n");
                return -EINVAL;
        }
 
@@ -219,12 +218,12 @@ ssize_t bat_device_write(struct file *file, const char __user *buff,
                return -EFAULT;
 
        if (icmp_packet.packet_type != BAT_ICMP) {
-               debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
+               printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");
                return -EINVAL;
        }
 
        if (icmp_packet.msg_type != ECHO_REQUEST) {
-               debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
+               printk(KERN_DEBUG "batman-adv:Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");
                return -EINVAL;
        }
 
index 5ea35da..e9cb977 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "hard-interface.h"
-#include "log.h"
 #include "soft-interface.h"
 #include "send.h"
 #include "translation-table.h"
@@ -87,9 +86,9 @@ static void check_known_mac_addr(uint8_t *addr)
                        continue;
 
                addr_to_string(mac_string, addr);
-               debug_log(LOG_TYPE_WARN, "The newly added mac address (%s) already exists on: %s\n",
-                         mac_string, batman_if->dev);
-               debug_log(LOG_TYPE_WARN, "It is strongly recommended to keep mac addresses unique to avoid problems!\n");
+               printk(KERN_WARNING "batman-adv:The newly added mac address (%s) already exists on: %s\n",
+                      mac_string, batman_if->dev);
+               printk(KERN_WARNING "batman-adv:It is strongly recommended to keep mac addresses unique to avoid problems!\n");
        }
        rcu_read_unlock();
 }
@@ -171,8 +170,8 @@ void hardif_deactivate_interface(struct batman_if *batman_if)
        batman_if->if_active = IF_INACTIVE;
        active_ifs--;
 
-       debug_log(LOG_TYPE_NOTICE, "Interface deactivated: %s\n",
-                 batman_if->dev);
+       printk(KERN_INFO "batman-adv:Interface deactivated: %s\n",
+                 batman_if->dev);
 }
 
 /* (re)activate given interface. */
@@ -197,7 +196,7 @@ static void hardif_activate_interface(struct batman_if *batman_if)
                                  &batman_if->raw_sock);
 
        if (retval < 0) {
-               debug_log(LOG_TYPE_WARN, "Can't create raw socket: %i\n",
+               printk(KERN_ERR "batman-adv:Can't create raw socket: %i\n",
                          retval);
                goto sock_err;
        }
@@ -210,7 +209,7 @@ static void hardif_activate_interface(struct batman_if *batman_if)
                             (struct sockaddr *)&bind_addr, sizeof(bind_addr));
 
        if (retval < 0) {
-               debug_log(LOG_TYPE_WARN, "Can't create bind raw socket: %i\n",
+               printk(KERN_ERR "batman-adv:Can't create bind raw socket: %i\n",
                          retval);
                goto bind_err;
        }
@@ -235,8 +234,8 @@ static void hardif_activate_interface(struct batman_if *batman_if)
        if (batman_if->if_num == 0)
                set_main_if_addr(batman_if->net_dev->dev_addr);
 
-       debug_log(LOG_TYPE_NOTICE, "Interface activated: %s\n",
-                 batman_if->dev);
+       printk(KERN_INFO "batman-adv:Interface activated: %s\n",
+                 batman_if->dev);
 
        return;
 
@@ -290,7 +289,7 @@ static int resize_orig(struct orig_node *orig_node, int if_num)
        data_ptr = kmalloc((if_num + 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS,
                           GFP_ATOMIC);
        if (!data_ptr) {
-               debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n");
+               printk(KERN_ERR "batman-adv:Can't resize orig: out of memory\n");
                return -1;
        }
 
@@ -301,7 +300,7 @@ static int resize_orig(struct orig_node *orig_node, int if_num)
 
        data_ptr = kmalloc((if_num + 1) * sizeof(uint8_t), GFP_ATOMIC);
        if (!data_ptr) {
-               debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n");
+               printk(KERN_ERR "batman-adv:Can't resize orig: out of memory\n");
                return -1;
        }
 
@@ -324,7 +323,7 @@ int hardif_add_interface(char *dev, int if_num)
        batman_if = kmalloc(sizeof(struct batman_if), GFP_KERNEL);
 
        if (!batman_if) {
-               debug_log(LOG_TYPE_WARN, "Can't add interface (%s): out of memory\n", dev);
+               printk(KERN_ERR "batman-adv:Can't add interface (%s): out of memory\n", dev);
                return -1;
        }
 
@@ -339,7 +338,7 @@ int hardif_add_interface(char *dev, int if_num)
        batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_KERNEL);
 
        if (!batman_if->packet_buff) {
-               debug_log(LOG_TYPE_WARN, "Can't add interface packet (%s): out of memory\n", dev);
+               printk(KERN_ERR "batman-adv:Can't add interface packet (%s): out of memory\n", dev);
                goto out;
        }
 
@@ -348,7 +347,7 @@ int hardif_add_interface(char *dev, int if_num)
        batman_if->if_active = IF_INACTIVE;
        INIT_RCU_HEAD(&batman_if->rcu);
 
-       debug_log(LOG_TYPE_NOTICE, "Adding interface: %s\n", dev);
+       printk(KERN_INFO "batman-adv:Adding interface: %s\n", dev);
        avail_ifs++;
 
        INIT_LIST_HEAD(&batman_if->list);
@@ -389,7 +388,7 @@ int hardif_add_interface(char *dev, int if_num)
        spin_unlock(&orig_hash_lock);
 
        if (!hardif_is_interface_up(batman_if->dev))
-               debug_log(LOG_TYPE_WARN, "Not using interface %s (retrying later): interface not active\n", batman_if->dev);
+               printk(KERN_ERR "batman-adv:Not using interface %s (retrying later): interface not active\n", batman_if->dev);
        else
                hardif_activate_interface(batman_if);
 
@@ -413,7 +412,7 @@ char hardif_get_active_if_num(void)
 }
 
 static int hard_if_event(struct notifier_block *this,
-                            unsigned long event, void *ptr)
+                           unsigned long event, void *ptr)
 {
        struct net_device *dev = (struct net_device *)ptr;
        struct batman_if *batman_if = get_batman_if_by_name(dev->name);
@@ -436,7 +435,6 @@ static int hard_if_event(struct notifier_block *this,
                break;
        /* NETDEV_CHANGEADDR - mac address change - what are we doing here ? */
        default:
-               /* debug_log(LOG_TYPE_CRIT, "hard_if_event: %s %i\n", dev->name, event); */
                break;
        };
 
@@ -447,5 +445,5 @@ out:
 }
 
 struct notifier_block hard_if_notifier = {
-        .notifier_call = hard_if_event,
+       .notifier_call = hard_if_event,
 };
diff --git a/drivers/staging/batman-adv/log.c b/drivers/staging/batman-adv/log.c
deleted file mode 100644 (file)
index f37c7f0..0000000
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-#include "main.h"
-#include "log.h"
-
-#define LOG_BUF_MASK (log_buf_len-1)
-#define LOG_BUF(idx) (log_buf[(idx) & LOG_BUF_MASK])
-
-static char log_buf[LOG_BUF_LEN];
-static int log_buf_len = LOG_BUF_LEN;
-static unsigned long log_start;
-static unsigned long log_end;
-uint8_t log_level;
-
-static DEFINE_SPINLOCK(logbuf_lock);
-
-const struct file_operations proc_log_operations = {
-       .open           = log_open,
-       .release        = log_release,
-       .read           = log_read,
-       .write          = log_write,
-       .poll           = log_poll,
-};
-
-static DECLARE_WAIT_QUEUE_HEAD(log_wait);
-
-static void emit_log_char(char c)
-{
-       LOG_BUF(log_end) = c;
-       log_end++;
-
-       if (log_end - log_start > log_buf_len)
-               log_start = log_end - log_buf_len;
-}
-
-static int fdebug_log(char *fmt, ...)
-{
-       int printed_len;
-       char *p;
-       va_list args;
-       static char debug_log_buf[256];
-       unsigned long flags;
-
-       spin_lock_irqsave(&logbuf_lock, flags);
-       va_start(args, fmt);
-       printed_len = vscnprintf(debug_log_buf, sizeof(debug_log_buf), fmt,
-                                args);
-       va_end(args);
-
-       for (p = debug_log_buf; *p != 0; p++)
-               emit_log_char(*p);
-
-       spin_unlock_irqrestore(&logbuf_lock, flags);
-
-       wake_up(&log_wait);
-
-       return 0;
-}
-
-int debug_log(int type, char *fmt, ...)
-{
-       va_list args;
-       int retval = 0;
-       char tmp_log_buf[256];
-
-       /* only critical information get into the official kernel log */
-       if (type == LOG_TYPE_CRIT) {
-               va_start(args, fmt);
-               vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
-               printk(KERN_ERR "batman-adv: %s", tmp_log_buf);
-               va_end(args);
-       }
-
-       if ((type == LOG_TYPE_CRIT) || (log_level & type)) {
-               va_start(args, fmt);
-               vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args);
-               fdebug_log("[%10u] %s", (jiffies / HZ), tmp_log_buf);
-               va_end(args);
-       }
-
-       return retval;
-}
-
-int log_open(struct inode *inode, struct file *file)
-{
-       inc_module_count();
-       return 0;
-}
-
-int log_release(struct inode *inode, struct file *file)
-{
-       dec_module_count();
-       return 0;
-}
-
-ssize_t log_read(struct file *file, char __user *buf, size_t count,
-                loff_t *ppos)
-{
-       int error, i = 0;
-       char c;
-       unsigned long flags;
-
-       if ((file->f_flags & O_NONBLOCK) && !(log_end - log_start))
-               return -EAGAIN;
-
-       if ((!buf) || (count < 0))
-               return -EINVAL;
-
-       if (count == 0)
-               return 0;
-
-       if (!access_ok(VERIFY_WRITE, buf, count))
-               return -EFAULT;
-
-       error = wait_event_interruptible(log_wait, (log_start - log_end));
-
-       if (error)
-               return error;
-
-       spin_lock_irqsave(&logbuf_lock, flags);
-
-       while ((!error) && (log_start != log_end) && (i < count)) {
-               c = LOG_BUF(log_start);
-
-               log_start++;
-
-               spin_unlock_irqrestore(&logbuf_lock, flags);
-
-               error = __put_user(c, buf);
-
-               spin_lock_irqsave(&logbuf_lock, flags);
-
-               buf++;
-               i++;
-
-       }
-
-       spin_unlock_irqrestore(&logbuf_lock, flags);
-
-       if (!error)
-               return i;
-
-       return error;
-}
-
-ssize_t log_write(struct file *file, const char __user *buf, size_t count,
-                 loff_t *ppos)
-{
-       return count;
-}
-
-unsigned int log_poll(struct file *file, poll_table *wait)
-{
-       poll_wait(file, &log_wait, wait);
-
-       if (log_end - log_start)
-               return POLLIN | POLLRDNORM;
-
-       return 0;
-}
diff --git a/drivers/staging/batman-adv/log.h b/drivers/staging/batman-adv/log.h
deleted file mode 100644 (file)
index 780e3ab..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors:
- *
- * Marek Lindner, Simon Wunderlich
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA
- *
- */
-
-extern const struct file_operations proc_log_operations;
-extern uint8_t log_level;
-
-int debug_log(int type, char *fmt, ...);
-int log_open(struct inode *inode, struct file *file);
-int log_release(struct inode *inode, struct file *file);
-ssize_t log_read(struct file *file, char __user *buf, size_t count,
-                loff_t *ppos);
-ssize_t log_write(struct file *file, const char __user *buf, size_t count,
-                 loff_t *ppos);
-unsigned int log_poll(struct file *file, poll_table *wait);
index bb89bfc..4b93a5d 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "proc.h"
-#include "log.h"
 #include "routing.h"
 #include "send.h"
 #include "soft-interface.h"
@@ -57,6 +56,17 @@ atomic_t module_state;
 
 struct workqueue_struct *bat_event_workqueue;
 
+#ifdef CONFIG_BATMAN_DEBUG
+int debug;
+
+module_param(debug, int, 0644);
+
+int bat_debug_type(int type)
+{
+       return debug & type;
+}
+#endif
+
 int init_module(void)
 {
        int retval;
@@ -90,21 +100,21 @@ int init_module(void)
                                   interface_setup);
 
        if (!soft_device) {
-               debug_log(LOG_TYPE_CRIT, "Unable to allocate the batman interface\n");
+               printk(KERN_ERR "batman-adv:Unable to allocate the batman interface\n");
                goto end;
        }
 
        retval = register_netdev(soft_device);
 
        if (retval < 0) {
-               debug_log(LOG_TYPE_CRIT, "Unable to register the batman interface: %i\n", retval);
+               printk(KERN_ERR "batman-adv:Unable to register the batman interface: %i\n", retval);
                goto free_soft_device;
        }
 
        register_netdevice_notifier(&hard_if_notifier);
 
-       debug_log(LOG_TYPE_CRIT, "B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded \n",
-                 SOURCE_VERSION, REVISION_VERSION_STR, COMPAT_VERSION);
+       printk(KERN_INFO "batman-adv:B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded \n",
+                 SOURCE_VERSION, REVISION_VERSION_STR, COMPAT_VERSION);
 
        return 0;
 
@@ -156,7 +166,7 @@ void activate_module(void)
                kthread_task = kthread_run(packet_recv_thread, NULL, "batman-adv");
 
                if (IS_ERR(kthread_task)) {
-                       debug_log(LOG_TYPE_CRIT, "Unable to start packet receive thread\n");
+                       printk(KERN_ERR "batman-adv:Unable to start packet receive thread\n");
                        kthread_task = NULL;
                }
        }
@@ -166,7 +176,7 @@ void activate_module(void)
        goto end;
 
 err:
-       debug_log(LOG_TYPE_CRIT, "Unable to allocate memory for mesh information structures: out of mem ?\n");
+       printk(KERN_ERR "batman-adv:Unable to allocate memory for mesh information structures: out of mem ?\n");
        shutdown_module();
 end:
        return;
index facb6b7..6907cac 100644 (file)
 
 #define TQ_MAX_VALUE 255
 #define JITTER 20
-#define TTL 50                   /* Time To Live of broadcast messages */
-#define MAX_ADDR 16              /* number of interfaces which can be added to
+#define TTL 50                   /* Time To Live of broadcast messages */
+#define MAX_ADDR 16              /* number of interfaces which can be added to
                                   * batman. */
 
-#define PURGE_TIMEOUT 200000      /* purge originators after time in ms if no
+#define PURGE_TIMEOUT 200000     /* purge originators after time in ms if no
                                   * valid packet comes in -> TODO: check
                                   * influence on TQ_LOCAL_WINDOW_SIZE */
 #define LOCAL_HNA_TIMEOUT 3600000
 
-#define TQ_LOCAL_WINDOW_SIZE 64   /* sliding packet range of received originator
+#define TQ_LOCAL_WINDOW_SIZE 64          /* sliding packet range of received originator
                                   * messages in squence numbers (should be a
                                   * multiple of our word size) */
 #define TQ_GLOBAL_WINDOW_SIZE 5
 
 
 /*
- * Logging
+ * Debug Messages
  */
 
-#define LOG_TYPE_CRIT 0                /* highest priority for fatal errors such as
-                                * blocked sockets / failed packet delivery /
-                                * programming errors */
-#define LOG_TYPE_WARN 1                /* warnings for small errors like wrong user
-                                * input / damaged packets / etc */
-#define LOG_TYPE_NOTICE 2      /* notice information for new interfaces /
-                                * changed settings / new originators / etc */
-#define LOG_TYPE_BATMAN 4      /* all messages related to routing / flooding /
-                                * broadcasting / etc */
-#define LOG_TYPE_ROUTES 8      /* route or hna added / changed / deleted */
-#define LOG_TYPE_CRIT_NAME     "critical"
-#define LOG_TYPE_WARN_NAME     "warnings"
-#define LOG_TYPE_NOTICE_NAME   "notices"
-#define LOG_TYPE_BATMAN_NAME   "batman"
-#define LOG_TYPE_ROUTES_NAME   "routes"
+#define DBG_BATMAN 1   /* all messages related to routing / flooding /
+                        * broadcasting / etc */
+#define DBG_ROUTES 2   /* route or hna added / changed / deleted */
+
+#ifdef CONFIG_BATMAN_DEBUG
+extern int debug;
+
+extern int bat_debug_type(int type);
+#define bat_dbg(type, fmt, arg...) do {                                        \
+               if (bat_debug_type(type))                               \
+                       printk(KERN_DEBUG "batman-adv:" fmt, ## arg);   \
+       }                                                               \
+       while (0)
+#else /* !CONFIG_BATMAN_DEBUG */
+#define bat_dbg(type, fmt, arg...) do {                \
+       }                                       \
+       while (0)
+#endif
 
 /*
  *  Vis
@@ -147,5 +150,3 @@ int choose_orig(void *data, int32_t size);
 int is_my_mac(uint8_t *addr);
 int is_bcast(uint8_t *addr);
 int is_mcast(uint8_t *addr);
-
-
index aac3df7..ed4c734 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "proc.h"
-#include "log.h"
 #include "routing.h"
 #include "translation-table.h"
 #include "hard-interface.h"
@@ -34,7 +33,6 @@ static uint8_t vis_format = DOT_DRAW;
 
 static struct proc_dir_entry *proc_batman_dir, *proc_interface_file;
 static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file;
-static struct proc_dir_entry *proc_log_file, *proc_log_level_file;
 static struct proc_dir_entry *proc_transt_local_file;
 static struct proc_dir_entry *proc_transt_global_file;
 static struct proc_dir_entry *proc_vis_file, *proc_vis_format_file;
@@ -77,8 +75,7 @@ static ssize_t proc_interfaces_write(struct file *instance,
                return -ENOMEM;
 
        if (count > IFNAMSIZ - 1) {
-               debug_log(LOG_TYPE_WARN,
-                         "Can't add interface: device name is too long\n");
+               printk(KERN_WARNING "batman-adv:Can't add interface: device name is too long\n");
                goto end;
        }
 
@@ -105,7 +102,7 @@ static ssize_t proc_interfaces_write(struct file *instance,
        rcu_read_lock();
        list_for_each_entry_rcu(batman_if, &if_list, list) {
                if (strncmp(batman_if->dev, if_string, count) == 0) {
-                       debug_log(LOG_TYPE_WARN, "Given interface is already active: %s\n", if_string);
+                       printk(KERN_ERR "batman-adv:Given interface is already active: %s\n", if_string);
                        rcu_read_unlock();
                        goto end;
 
@@ -162,20 +159,18 @@ static ssize_t proc_orig_interval_write(struct file *file,
 
        retval = strict_strtoul(interval_string, 10, &originator_interval_tmp);
        if (retval) {
-               debug_log(LOG_TYPE_WARN, "New originator interval invalid\n");
+               printk(KERN_ERR "batman-adv:New originator interval invalid\n");
                goto end;
        }
 
        if (originator_interval_tmp <= JITTER * 2) {
-               debug_log(LOG_TYPE_WARN,
-                         "New originator interval too small: %i (min: %i)\n",
-                         originator_interval_tmp, JITTER * 2);
+               printk(KERN_WARNING "batman-adv:New originator interval too small: %li (min: %i)\n",
+                      originator_interval_tmp, JITTER * 2);
                goto end;
        }
 
-       debug_log(LOG_TYPE_NOTICE,
-                 "Changing originator interval from: %i to: %i\n",
-                 atomic_read(&originator_interval), originator_interval_tmp);
+       printk(KERN_INFO "batman-adv:Changing originator interval from: %i to: %li\n",
+              atomic_read(&originator_interval), originator_interval_tmp);
 
        atomic_set(&originator_interval, originator_interval_tmp);
 
@@ -235,7 +230,7 @@ static int proc_originators_read(struct seq_file *seq, void *offset)
                addr_to_string(orig_str, orig_node->orig);
                addr_to_string(router_str, orig_node->router->addr);
 
-               seq_printf(seq, "%-17s  (%3i) %17s [%10s]:",
+               seq_printf(seq, "%-17s  (%3i) %17s [%10s]:",
                           orig_str, orig_node->router->tq_avg,
                           router_str, orig_node->router->if_incoming->dev);
 
@@ -263,84 +258,6 @@ static int proc_originators_open(struct inode *inode, struct file *file)
        return single_open(file, proc_originators_read, NULL);
 }
 
-static int proc_log_level_read(struct seq_file *seq, void *offset)
-{
-
-       seq_printf(seq, "[x] %s (%d)\n", LOG_TYPE_CRIT_NAME, LOG_TYPE_CRIT);
-       seq_printf(seq, "[%c] %s (%d)\n",
-                  (LOG_TYPE_WARN & log_level) ? 'x' : ' ',
-                  LOG_TYPE_WARN_NAME, LOG_TYPE_WARN);
-       seq_printf(seq, "[%c] %s (%d)\n",
-                  (LOG_TYPE_NOTICE & log_level) ? 'x' : ' ',
-                  LOG_TYPE_NOTICE_NAME, LOG_TYPE_NOTICE);
-       seq_printf(seq, "[%c] %s (%d)\n",
-                  (LOG_TYPE_BATMAN & log_level) ? 'x' : ' ',
-                  LOG_TYPE_BATMAN_NAME, LOG_TYPE_BATMAN);
-       seq_printf(seq, "[%c] %s (%d)\n",
-                  (LOG_TYPE_ROUTES & log_level) ? 'x' : ' ',
-                  LOG_TYPE_ROUTES_NAME, LOG_TYPE_ROUTES);
-       return 0;
-}
-
-static int proc_log_level_open(struct inode *inode, struct file *file)
-{
-       return single_open(file, proc_log_level_read, NULL);
-}
-
-static ssize_t proc_log_level_write(struct file *instance,
-                                   const char __user *userbuffer,
-                                   size_t count, loff_t *data)
-{
-       char *log_level_string, *tokptr, *cp;
-       int finished, not_copied = 0;
-       unsigned long log_level_tmp = 0;
-
-       log_level_string = kmalloc(count, GFP_KERNEL);
-
-       if (!log_level_string)
-               return -ENOMEM;
-
-       not_copied = copy_from_user(log_level_string, userbuffer, count);
-       log_level_string[count - not_copied - 1] = 0;
-
-       if (strict_strtoul(log_level_string, 10, &log_level_tmp) < 0) {
-               /* was not a number, doing textual parsing */
-               log_level_tmp = 0;
-               tokptr = log_level_string;
-
-               for (cp = log_level_string, finished = 0; !finished; cp++) {
-                       switch (*cp) {
-                       case 0:
-                               finished = 1;
-                       case ' ':
-                       case '\n':
-                       case '\t':
-                               *cp = 0;
-                               /* compare */
-                               if (strcmp(tokptr, LOG_TYPE_WARN_NAME) == 0)
-                                       log_level_tmp |= LOG_TYPE_WARN;
-                               if (strcmp(tokptr, LOG_TYPE_NOTICE_NAME) == 0)
-                                       log_level_tmp |= LOG_TYPE_NOTICE;
-                               if (strcmp(tokptr, LOG_TYPE_BATMAN_NAME) == 0)
-                                       log_level_tmp |= LOG_TYPE_BATMAN;
-                               if (strcmp(tokptr, LOG_TYPE_ROUTES_NAME) == 0)
-                                       log_level_tmp |= LOG_TYPE_ROUTES;
-                               tokptr = cp + 1;
-                               break;
-                       default:
-                               ;
-                       }
-               }
-       }
-
-       debug_log(LOG_TYPE_CRIT, "Changing log_level from: %i to: %i\n",
-                 log_level, log_level_tmp);
-       log_level = log_level_tmp;
-
-       kfree(log_level_string);
-       return count;
-}
-
 static int proc_transt_local_read(struct seq_file *seq, void *offset)
 {
        char *buf;
@@ -412,7 +329,7 @@ static void proc_vis_insert_interface(const uint8_t *interface,
                                      bool primary)
 {
        /* Did we get an empty list? (then insert imediately) */
-       if(*if_entry == NULL) {
+       if (*if_entry == NULL) {
                *if_entry = kmalloc(sizeof(struct vis_if_list), GFP_KERNEL);
                if (*if_entry == NULL)
                        return;
@@ -585,14 +502,14 @@ static ssize_t proc_vis_write(struct file *file, const char __user * buffer,
        vis_mode_string[count - not_copied - 1] = 0;
 
        if (strcmp(vis_mode_string, "client") == 0) {
-               debug_log(LOG_TYPE_NOTICE, "Setting VIS mode to client\n");
+               printk(KERN_INFO "batman-adv:Setting VIS mode to client\n");
                vis_set_mode(VIS_TYPE_CLIENT_UPDATE);
        } else if (strcmp(vis_mode_string, "server") == 0) {
-               debug_log(LOG_TYPE_NOTICE, "Setting VIS mode to server\n");
+               printk(KERN_INFO "batman-adv:Setting VIS mode to server\n");
                vis_set_mode(VIS_TYPE_SERVER_SYNC);
        } else
-               debug_log(LOG_TYPE_WARN, "Unknown VIS mode: %s\n",
-                         vis_mode_string);
+               printk(KERN_ERR "batman-adv:Unknown VIS mode: %s\n",
+                      vis_mode_string);
 
        kfree(vis_mode_string);
        return count;
@@ -637,16 +554,16 @@ static ssize_t proc_vis_format_write(struct file *file,
        vis_format_string[count - not_copied - 1] = 0;
 
        if (strcmp(vis_format_string, VIS_FORMAT_DD_NAME) == 0) {
-               debug_log(LOG_TYPE_NOTICE, "Setting VIS output format to: %s\n",
-                         VIS_FORMAT_DD_NAME);
+               printk(KERN_INFO "batman-adv:Setting VIS output format to: %s\n",
+                      VIS_FORMAT_DD_NAME);
                vis_format = DOT_DRAW;
        } else if (strcmp(vis_format_string, VIS_FORMAT_JSON_NAME) == 0) {
-               debug_log(LOG_TYPE_NOTICE, "Setting VIS output format to: %s\n",
-                         VIS_FORMAT_JSON_NAME);
+               printk(KERN_INFO "batman-adv:Setting VIS output format to: %s\n",
+                      VIS_FORMAT_JSON_NAME);
                vis_format = JSON;
        } else
-               debug_log(LOG_TYPE_WARN, "Unknown VIS output format: %s\n",
-                         vis_format_string);
+               printk(KERN_ERR "batman-adv:Unknown VIS output format: %s\n",
+                      vis_format_string);
 
        kfree(vis_format_string);
        return count;
@@ -677,16 +594,16 @@ static ssize_t proc_aggr_write(struct file *file, const char __user *buffer,
        strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp);
 
        if ((aggregation_enabled_tmp != 0) && (aggregation_enabled_tmp != 1)) {
-               debug_log(LOG_TYPE_WARN, "Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp);
+               printk(KERN_ERR "batman-adv:Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp);
                goto end;
        }
 
-       debug_log(LOG_TYPE_NOTICE, "Changing aggregation from: %s (%i) to: %s (%li)\n",
-                 (atomic_read(&aggregation_enabled) == 1 ?
-                  "enabled" : "disabled"),
-                 atomic_read(&aggregation_enabled),
-                 (aggregation_enabled_tmp == 1 ? "enabled" : "disabled"),
-                 aggregation_enabled_tmp);
+       printk(KERN_INFO "batman-adv:Changing aggregation from: %s (%i) to: %s (%li)\n",
+              (atomic_read(&aggregation_enabled) == 1 ?
+               "enabled" : "disabled"),
+              atomic_read(&aggregation_enabled),
+              (aggregation_enabled_tmp == 1 ? "enabled" : "disabled"),
+              aggregation_enabled_tmp);
 
        atomic_set(&aggregation_enabled, (unsigned)aggregation_enabled_tmp);
 end:
@@ -760,15 +677,6 @@ static const struct file_operations proc_transt_global_fops = {
        .release        = single_release,
 };
 
-static const struct file_operations proc_log_level_fops = {
-       .owner          = THIS_MODULE,
-       .open           = proc_log_level_open,
-       .read           = seq_read,
-       .write          = proc_log_level_write,
-       .llseek         = seq_lseek,
-       .release        = single_release,
-};
-
 static const struct file_operations proc_interfaces_fops = {
        .owner          = THIS_MODULE,
        .open           = proc_interfaces_open,
@@ -795,12 +703,6 @@ void cleanup_procfs(void)
        if (proc_transt_local_file)
                remove_proc_entry(PROC_FILE_TRANST_LOCAL, proc_batman_dir);
 
-       if (proc_log_file)
-               remove_proc_entry(PROC_FILE_LOG, proc_batman_dir);
-
-       if (proc_log_level_file)
-               remove_proc_entry(PROC_FILE_LOG_LEVEL, proc_batman_dir);
-
        if (proc_originators_file)
                remove_proc_entry(PROC_FILE_ORIGINATORS, proc_batman_dir);
 
@@ -862,17 +764,6 @@ int setup_procfs(void)
                return -EFAULT;
        }
 
-       proc_log_level_file = create_proc_entry(PROC_FILE_LOG_LEVEL,
-                                               S_IWUSR | S_IRUGO,
-                                               proc_batman_dir);
-       if (proc_log_level_file) {
-               proc_log_level_file->proc_fops = &proc_log_level_fops;
-       } else {
-               printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_LOG_LEVEL);
-               cleanup_procfs();
-               return -EFAULT;
-       }
-
        proc_originators_file = create_proc_entry(PROC_FILE_ORIGINATORS,
                                                  S_IRUGO, proc_batman_dir);
        if (proc_originators_file) {
@@ -883,16 +774,6 @@ int setup_procfs(void)
                return -EFAULT;
        }
 
-       proc_log_file = create_proc_entry(PROC_FILE_LOG,
-                                         S_IRUGO, proc_batman_dir);
-       if (proc_log_file) {
-               proc_log_file->proc_fops = &proc_log_operations;
-       } else {
-               printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_FILE_LOG, PROC_FILE_GATEWAYS);
-               cleanup_procfs();
-               return -EFAULT;
-       }
-
        proc_transt_local_file = create_proc_entry(PROC_FILE_TRANST_LOCAL,
                                                   S_IRUGO, proc_batman_dir);
        if (proc_transt_local_file) {
index 4a14c36..1f42d41 100644 (file)
@@ -25,7 +25,6 @@
 
 #include "main.h"
 #include "routing.h"
-#include "log.h"
 #include "send.h"
 #include "soft-interface.h"
 #include "hard-interface.h"
@@ -88,7 +87,7 @@ static struct neigh_node *create_neighbor(struct orig_node *orig_node, struct or
 {
        struct neigh_node *neigh_node;
 
-       debug_log(LOG_TYPE_BATMAN, "Creating new last-hop neighbour of originator\n");
+       bat_dbg(DBG_BATMAN, "Creating new last-hop neighbour of originator\n");
 
        neigh_node = kmalloc(sizeof(struct neigh_node), GFP_ATOMIC);
        memset(neigh_node, 0, sizeof(struct neigh_node));
@@ -136,7 +135,7 @@ static struct orig_node *get_orig_node(uint8_t *addr)
                return orig_node;
 
        addr_to_string(orig_str, addr);
-       debug_log(LOG_TYPE_BATMAN, "Creating new originator: %s \n", orig_str);
+       bat_dbg(DBG_BATMAN, "Creating new originator: %s \n", orig_str);
 
        orig_node = kmalloc(sizeof(struct orig_node), GFP_ATOMIC);
        memset(orig_node, 0, sizeof(struct orig_node));
@@ -159,7 +158,7 @@ static struct orig_node *get_orig_node(uint8_t *addr)
                swaphash = hash_resize(orig_hash, orig_hash->size * 2);
 
                if (swaphash == NULL)
-                       debug_log(LOG_TYPE_CRIT, "Couldn't resize orig hash table \n");
+                       printk(KERN_ERR "batman-adv:Couldn't resize orig hash table \n");
                else
                        orig_hash = swaphash;
        }
@@ -196,15 +195,15 @@ static void update_routes(struct orig_node *orig_node, struct neigh_node *neigh_
 
                /* route deleted */
                if ((orig_node->router != NULL) && (neigh_node == NULL)) {
-
-                       debug_log(LOG_TYPE_ROUTES, "Deleting route towards: %s\n", orig_str);
+                       bat_dbg(DBG_ROUTES, "Deleting route towards: %s\n",
+                               orig_str);
                        hna_global_del_orig(orig_node, "originator timed out");
 
                /* route added */
                } else if ((orig_node->router == NULL) && (neigh_node != NULL)) {
 
                        addr_to_string(neigh_str, neigh_node->addr);
-                       debug_log(LOG_TYPE_ROUTES, "Adding route towards: %s (via %s)\n", orig_str, neigh_str);
+                       bat_dbg(DBG_ROUTES, "Adding route towards: %s (via %s)\n", orig_str, neigh_str);
                        hna_global_add_orig(orig_node, hna_buff, hna_buff_len);
 
                /* route changed */
@@ -212,7 +211,7 @@ static void update_routes(struct orig_node *orig_node, struct neigh_node *neigh_
 
                        addr_to_string(neigh_str, neigh_node->addr);
                        addr_to_string(router_str, orig_node->router->addr);
-                       debug_log(LOG_TYPE_ROUTES, "Changing route towards: %s (now via %s - was via %s)\n", orig_str, neigh_str, router_str);
+                       bat_dbg(DBG_ROUTES, "Changing route towards: %s (now via %s - was via %s)\n", orig_str, neigh_str, router_str);
 
                }
 
@@ -296,9 +295,9 @@ static int isBidirectionalNeigh(struct orig_node *orig_node, struct orig_node *o
                        (TQ_LOCAL_WINDOW_SIZE - neigh_node->real_packet_count)) /
                        (TQ_LOCAL_WINDOW_SIZE * TQ_LOCAL_WINDOW_SIZE * TQ_LOCAL_WINDOW_SIZE);
 
-       batman_packet->tq = ((batman_packet->tq * orig_neigh_node->tq_own * orig_neigh_node->tq_asym_penalty) / (TQ_MAX_VALUE *  TQ_MAX_VALUE));
+       batman_packet->tq = ((batman_packet->tq * orig_neigh_node->tq_own * orig_neigh_node->tq_asym_penalty) / (TQ_MAX_VALUE *  TQ_MAX_VALUE));
 
-       debug_log(LOG_TYPE_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i \n",
+       bat_dbg(DBG_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i \n",
                  orig_str, neigh_str, total_count, neigh_node->real_packet_count, orig_neigh_node->tq_own, orig_neigh_node->tq_asym_penalty, batman_packet->tq);
 
        /* if link has the minimum required transmission quality consider it bidirectional */
@@ -313,7 +312,7 @@ static void update_orig(struct orig_node *orig_node, struct ethhdr *ethhdr, stru
        struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL;
        int tmp_hna_buff_len;
 
-       debug_log(LOG_TYPE_BATMAN, "update_originator(): Searching and updating originator entry of received packet \n");
+       bat_dbg(DBG_BATMAN, "update_originator(): Searching and updating originator entry of received packet \n");
 
        list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) {
                if (compare_orig(tmp_neigh_node->addr, ethhdr->h_source) && (tmp_neigh_node->if_incoming == if_incoming)) {
@@ -331,7 +330,7 @@ static void update_orig(struct orig_node *orig_node, struct ethhdr *ethhdr, stru
        if (neigh_node == NULL)
                neigh_node = create_neighbor(orig_node, get_orig_node(ethhdr->h_source), ethhdr->h_source, if_incoming);
        else
-               debug_log(LOG_TYPE_BATMAN, "Updating existing last-hop neighbour of originator\n");
+               bat_dbg(DBG_BATMAN, "Updating existing last-hop neighbour of originator\n");
 
        orig_node->flags = batman_packet->flags;
        neigh_node->last_valid = jiffies;
@@ -396,7 +395,8 @@ static char count_real_packets(struct ethhdr *ethhdr, struct batman_packet *batm
        }
 
        if (!is_duplicate) {
-               debug_log(LOG_TYPE_BATMAN, "updating last_seqno: old %d, new %d \n", orig_node->last_real_seqno, batman_packet->seqno);
+               bat_dbg(DBG_BATMAN, "updating last_seqno: old %d, new %d \n",
+                       orig_node->last_real_seqno, batman_packet->seqno);
                orig_node->last_real_seqno = batman_packet->seqno;
        }
 
@@ -436,7 +436,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
 
        is_single_hop_neigh = (compare_orig(ethhdr->h_source, batman_packet->orig) ? 1 : 0);
 
-       debug_log(LOG_TYPE_BATMAN, "Received BATMAN packet via NB: %s, IF: %s [%s] (from OG: %s, via prev OG: %s, seqno %d, tq %d, TTL %d, V %d, IDF %d) \n", neigh_str, if_incoming->dev, if_incoming->addr_str, orig_str, prev_sender_str, batman_packet->seqno, batman_packet->tq, batman_packet->ttl, batman_packet->version, has_directlink_flag);
+       bat_dbg(DBG_BATMAN, "Received BATMAN packet via NB: %s, IF: %s [%s] (from OG: %s, via prev OG: %s, seqno %d, tq %d, TTL %d, V %d, IDF %d) \n", neigh_str, if_incoming->dev, if_incoming->addr_str, orig_str, prev_sender_str, batman_packet->seqno, batman_packet->tq, batman_packet->ttl, batman_packet->version, has_directlink_flag);
 
        list_for_each_entry_rcu(batman_if, &if_list, list) {
                if (batman_if->if_active != IF_ACTIVE)
@@ -456,17 +456,17 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
        }
 
        if (batman_packet->version != COMPAT_VERSION) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: incompatible batman version (%i) \n", batman_packet->version);
+               bat_dbg(DBG_BATMAN, "Drop packet: incompatible batman version (%i) \n", batman_packet->version);
                return;
        }
 
        if (is_my_addr) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: received my own broadcast (sender: %s) \n", neigh_str);
+               bat_dbg(DBG_BATMAN, "Drop packet: received my own broadcast (sender: %s) \n", neigh_str);
                return;
        }
 
        if (is_broadcast) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: ignoring all packets with broadcast source addr (sender: %s) \n", neigh_str);
+               bat_dbg(DBG_BATMAN, "Drop packet: ignoring all packets with broadcast source addr (sender: %s) \n", neigh_str);
                return;
        }
 
@@ -481,19 +481,19 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
                        orig_neigh_node->bcast_own_sum[if_incoming->if_num] = bit_packet_count((TYPE_OF_WORD *)&(orig_neigh_node->bcast_own[if_incoming->if_num * NUM_WORDS]));
                }
 
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: originator packet from myself (via neighbour) \n");
+               bat_dbg(DBG_BATMAN, "Drop packet: originator packet from myself (via neighbour) \n");
                return;
        }
 
        if (batman_packet->tq == 0) {
                count_real_packets(ethhdr, batman_packet, if_incoming);
 
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: originator packet with tq equal 0 \n");
+               bat_dbg(DBG_BATMAN, "Drop packet: originator packet with tq equal 0 \n");
                return;
        }
 
        if (is_my_oldorig) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: ignoring all rebroadcast echos (sender: %s) \n", neigh_str);
+               bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast echos (sender: %s) \n", neigh_str);
                return;
        }
 
@@ -508,7 +508,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
            (compare_orig(orig_node->router->addr, batman_packet->prev_sender)) &&
            !(compare_orig(batman_packet->orig, batman_packet->prev_sender)) &&
            (compare_orig(orig_node->router->addr, orig_node->router->orig_node->router->addr))) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %s) \n", neigh_str);
+               bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %s) \n", neigh_str);
                return;
        }
 
@@ -519,7 +519,7 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
 
        /* drop packet if sender is not a direct neighbor and if we don't route towards it */
        if (!is_single_hop_neigh && (orig_neigh_node->router == NULL)) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: OGM via unknown neighbor! \n");
+               bat_dbg(DBG_BATMAN, "Drop packet: OGM via unknown neighbor!\n");
                return;
        }
 
@@ -537,22 +537,22 @@ void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_pack
                /* mark direct link on incoming interface */
                schedule_forward_packet(orig_node, ethhdr, batman_packet, 1, hna_buff_len, if_incoming);
 
-               debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast neighbour packet with direct link flag \n");
+               bat_dbg(DBG_BATMAN, "Forwarding packet: rebroadcast neighbour packet with direct link flag\n");
                return;
        }
 
        /* multihop originator */
        if (!is_bidirectional) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: not received via bidirectional link\n");
+               bat_dbg(DBG_BATMAN, "Drop packet: not received via bidirectional link\n");
                return;
        }
 
        if (is_duplicate) {
-               debug_log(LOG_TYPE_BATMAN, "Drop packet: duplicate packet received\n");
+               bat_dbg(DBG_BATMAN, "Drop packet: duplicate packet received\n");
                return;
        }
 
-       debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast originator packet \n");
+       bat_dbg(DBG_BATMAN, "Forwarding packet: rebroadcast originator packet\n");
        schedule_forward_packet(orig_node, ethhdr, batman_packet, 0, hna_buff_len, if_incoming);
 }
 
@@ -574,7 +574,7 @@ void purge_orig(struct work_struct *work)
 
                if (time_after(jiffies, orig_node->last_valid + ((2 * PURGE_TIMEOUT * HZ) / 1000))) {
 
-                       debug_log(LOG_TYPE_BATMAN, "Originator timeout: originator %s, last_valid %u \n", orig_str, (orig_node->last_valid / HZ));
+                       bat_dbg(DBG_BATMAN, "Originator timeout: originator %s, last_valid %lu\n", orig_str, (orig_node->last_valid / HZ));
 
                        hash_remove_bucket(orig_hash, hashit);
                        free_orig_node(orig_node);
@@ -591,7 +591,7 @@ void purge_orig(struct work_struct *work)
                                if (time_after(jiffies, neigh_node->last_valid + ((PURGE_TIMEOUT * HZ) / 1000))) {
 
                                        addr_to_string(neigh_str, neigh_node->addr);
-                                       debug_log(LOG_TYPE_BATMAN, "Neighbour timeout: originator %s, neighbour: %s, last_valid %u \n", orig_str, neigh_str, (neigh_node->last_valid / HZ));
+                                       bat_dbg(DBG_BATMAN, "Neighbour timeout: originator %s, neighbour: %s, last_valid %lu\n", orig_str, neigh_str, (neigh_node->last_valid / HZ));
 
                                        neigh_purged = 1;
                                        list_del(list_pos);
@@ -652,7 +652,7 @@ int packet_recv_thread(void *data)
        atomic_set(&exit_cond, 0);
        packet_buff = kmalloc(PACKBUFF_SIZE, GFP_KERNEL);
        if (!packet_buff) {
-               debug_log(LOG_TYPE_CRIT, "Could allocate memory for the packet buffer. :(\n");
+               printk(KERN_ERR "batman-adv:Could allocate memory for the packet buffer. :(\n");
                return -1;
        }
 
@@ -677,9 +677,9 @@ int packet_recv_thread(void *data)
                        while (1) {
                                if (batman_if->if_active != IF_ACTIVE) {
                                        if (batman_if->if_active != IF_TO_BE_ACTIVATED)
-                                               debug_log(LOG_TYPE_NOTICE,
-                                                         "Could not read from deactivated interface %s!\n",
-                                                         batman_if->dev);
+                                               printk(KERN_WARNING
+                                                      "batman-adv:Could not read from deactivated interface %s!\n",
+                                                      batman_if->dev);
 
                                        if (batman_if->raw_sock)
                                                receive_raw_packet(batman_if->raw_sock, packet_buff, PACKBUFF_SIZE);
@@ -698,7 +698,7 @@ int packet_recv_thread(void *data)
                                batman_packet = (struct batman_packet *)(packet_buff + sizeof(struct ethhdr));
 
                                if (batman_packet->version != COMPAT_VERSION) {
-                                       debug_log(LOG_TYPE_BATMAN, "Drop packet: incompatible batman version (%i) \n", batman_packet->version);
+                                       bat_dbg(DBG_BATMAN, "Drop packet: incompatible batman version (%i)\n", batman_packet->version);
                                        continue;
                                }
 
@@ -719,9 +719,9 @@ int packet_recv_thread(void *data)
 
                                        spin_lock(&orig_hash_lock);
                                        receive_aggr_bat_packet(ethhdr,
-                                                               packet_buff + sizeof(struct ethhdr),
-                                                               result - sizeof(struct ethhdr),
-                                                               batman_if);
+                                                               packet_buff + sizeof(struct ethhdr),
+                                                               result - sizeof(struct ethhdr),
+                                                               batman_if);
                                        spin_unlock(&orig_hash_lock);
 
                                        break;
@@ -768,9 +768,9 @@ int packet_recv_thread(void *data)
                                                        icmp_packet->ttl = TTL;
 
                                                        send_raw_packet(packet_buff + sizeof(struct ethhdr),
-                                                                       result - sizeof(struct ethhdr),
-                                                                       orig_node->batman_if,
-                                                                       orig_node->router->addr);
+                                                                       result - sizeof(struct ethhdr),
+                                                                       orig_node->batman_if,
+                                                                       orig_node->router->addr);
 
                                                }
 
@@ -785,7 +785,7 @@ int packet_recv_thread(void *data)
                                                addr_to_string(src_str, icmp_packet->orig);
                                                addr_to_string(dst_str, icmp_packet->dst);
 
-                                               debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str);
+                                               printk(KERN_WARNING "batman-adv:Warning - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str);
 
                                                /* send TTL exceeded if packet is an echo request (traceroute) */
                                                if (icmp_packet->msg_type != ECHO_REQUEST)
@@ -803,9 +803,9 @@ int packet_recv_thread(void *data)
                                                        icmp_packet->ttl = TTL;
 
                                                        send_raw_packet(packet_buff + sizeof(struct ethhdr),
-                                                                       result - sizeof(struct ethhdr),
-                                                                       orig_node->batman_if,
-                                                                       orig_node->router->addr);
+                                                                       result - sizeof(struct ethhdr),
+                                                                       orig_node->batman_if,
+                                                                       orig_node->router->addr);
 
                                                }
 
@@ -825,9 +825,9 @@ int packet_recv_thread(void *data)
 
                                                /* route it */
                                                send_raw_packet(packet_buff + sizeof(struct ethhdr),
-                                                               result - sizeof(struct ethhdr),
-                                                               orig_node->batman_if,
-                                                               orig_node->router->addr);
+                                                               result - sizeof(struct ethhdr),
+                                                               orig_node->batman_if,
+                                                               orig_node->router->addr);
                                        }
 
                                        spin_unlock(&orig_hash_lock);
@@ -866,7 +866,7 @@ int packet_recv_thread(void *data)
                                                addr_to_string(src_str, ((struct ethhdr *)(unicast_packet + 1))->h_source);
                                                addr_to_string(dst_str, unicast_packet->dest);
 
-                                               debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str);
+                                               printk(KERN_WARNING "batman-adv:Warning - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str);
                                                continue;
                                        }
 
@@ -880,9 +880,9 @@ int packet_recv_thread(void *data)
 
                                                /* route it */
                                                send_raw_packet(packet_buff + sizeof(struct ethhdr),
-                                                               result - sizeof(struct ethhdr),
-                                                               orig_node->batman_if,
-                                                               orig_node->router->addr);
+                                                               result - sizeof(struct ethhdr),
+                                                               orig_node->batman_if,
+                                                               orig_node->router->addr);
                                        }
 
                                        spin_unlock(&orig_hash_lock);
@@ -980,7 +980,7 @@ int packet_recv_thread(void *data)
                        }
 
                        if ((result < 0) && (result != -EAGAIN))
-                               debug_log(LOG_TYPE_CRIT, "Could not receive packet from interface %s: %i\n", batman_if->dev, result);
+                               printk(KERN_ERR "batman-adv:Could not receive packet from interface %s: %i\n", batman_if->dev, result);
 
                        /* lock for the next iteration */
                        rcu_read_lock();
index eb61750..fc4953f 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "send.h"
-#include "log.h"
 #include "routing.h"
 #include "translation-table.h"
 #include "hard-interface.h"
@@ -72,9 +71,9 @@ void send_raw_packet(unsigned char *pack_buff, int pack_buff_len,
                return;
 
        if (!(batman_if->net_dev->flags & IFF_UP)) {
-               debug_log(LOG_TYPE_WARN,
-                        "Interface %s is not up - can't send packet via that interface (IF_TO_BE_DEACTIVATED was here) !\n",
-                         batman_if->dev);
+               printk(KERN_WARNING
+                      "batman-adv:Interface %s is not up - can't send packet via that interface!\n",
+                      batman_if->dev);
                return;
        }
 
@@ -101,9 +100,9 @@ void send_raw_packet(unsigned char *pack_buff, int pack_buff_len,
         * (which is > 0). This will not be treated as an error. */
        retval = dev_queue_xmit(skb);
        if (retval < 0)
-               debug_log(LOG_TYPE_CRIT,
-                         "Can't write to raw socket (IF_TO_BE_DEACTIVATED was here): %i\n",
-                         retval);
+               printk(KERN_WARNING
+                      "batman-adv:Can't write to raw socket: %i\n",
+                      retval);
 }
 
 /* Send a packet to a given interface */
@@ -140,15 +139,15 @@ static void send_packet_to_if(struct forw_packet *forw_packet,
                fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?
                                                            "Sending own" :
                                                            "Forwarding"));
-               debug_log(LOG_TYPE_BATMAN,
-                         "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n",
-                         fwd_str,
-                         (packet_num > 0 ? "aggregated " : ""),
-                         orig_str, ntohs(batman_packet->seqno),
-                         batman_packet->tq, batman_packet->ttl,
-                         (batman_packet->flags & DIRECTLINK ?
-                          "on" : "off"),
-                         batman_if->dev, batman_if->addr_str);
+               bat_dbg(DBG_BATMAN,
+                       "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n",
+                       fwd_str,
+                       (packet_num > 0 ? "aggregated " : ""),
+                       orig_str, ntohs(batman_packet->seqno),
+                       batman_packet->tq, batman_packet->ttl,
+                       (batman_packet->flags & DIRECTLINK ?
+                        "on" : "off"),
+                       batman_if->dev, batman_if->addr_str);
 
                buff_pos += sizeof(struct batman_packet) +
                        (batman_packet->num_hna * ETH_ALEN);
@@ -172,8 +171,7 @@ static void send_packet(struct forw_packet *forw_packet)
        unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0);
 
        if (!forw_packet->if_incoming) {
-               debug_log(LOG_TYPE_CRIT,
-                         "Error - can't forward packet: incoming iface not specified\n");
+               printk(KERN_ERR "batman-adv: Error - can't forward packet: incoming iface not specified\n");
                return;
        }
 
@@ -188,12 +186,12 @@ static void send_packet(struct forw_packet *forw_packet)
            (forw_packet->own && (forw_packet->if_incoming->if_num > 0))) {
 
                /* FIXME: what about aggregated packets ? */
-               debug_log(LOG_TYPE_BATMAN,
-                         "%s packet (originator %s, seqno %d, TTL %d) on interface %s [%s]\n",
-                         (forw_packet->own ? "Sending own" : "Forwarding"),
-                         orig_str, ntohs(batman_packet->seqno),
-                         batman_packet->ttl, forw_packet->if_incoming->dev,
-                         forw_packet->if_incoming->addr_str);
+               bat_dbg(DBG_BATMAN,
+                       "%s packet (originator %s, seqno %d, TTL %d) on interface %s [%s]\n",
+                       (forw_packet->own ? "Sending own" : "Forwarding"),
+                       orig_str, ntohs(batman_packet->seqno),
+                       batman_packet->ttl, forw_packet->if_incoming->dev,
+                       forw_packet->if_incoming->addr_str);
 
                send_raw_packet(forw_packet->packet_buff,
                                forw_packet->packet_len,
@@ -286,7 +284,7 @@ void schedule_forward_packet(struct orig_node *orig_node,
        unsigned long send_time;
 
        if (batman_packet->ttl <= 1) {
-               debug_log(LOG_TYPE_BATMAN, "ttl exceeded \n");
+               bat_dbg(DBG_BATMAN, "ttl exceeded \n");
                return;
        }
 
@@ -314,9 +312,9 @@ void schedule_forward_packet(struct orig_node *orig_node,
        /* apply hop penalty */
        batman_packet->tq = hop_penalty(batman_packet->tq);
 
-       debug_log(LOG_TYPE_BATMAN, "Forwarding packet: tq_orig: %i, tq_avg: %i, tq_forw: %i, ttl_orig: %i, ttl_forw: %i \n",
-                 in_tq, tq_avg, batman_packet->tq, in_ttl - 1,
-                 batman_packet->ttl);
+       bat_dbg(DBG_BATMAN, "Forwarding packet: tq_orig: %i, tq_avg: %i, tq_forw: %i, ttl_orig: %i, ttl_forw: %i \n",
+               in_tq, tq_avg, batman_packet->tq, in_ttl - 1,
+               batman_packet->ttl);
 
        batman_packet->seqno = htons(batman_packet->seqno);
 
@@ -439,7 +437,7 @@ void purge_outstanding_packets(void)
        struct forw_packet *forw_packet;
        struct hlist_node *tmp_node, *safe_tmp_node;
 
-       debug_log(LOG_TYPE_BATMAN, "purge_outstanding_packets()\n");
+       bat_dbg(DBG_BATMAN, "purge_outstanding_packets()\n");
 
        /* free bcast list */
        spin_lock(&forw_bcast_list_lock);
index d543f50..168a4e1 100644 (file)
@@ -24,7 +24,6 @@
 #include "hard-interface.h"
 #include "send.h"
 #include "translation-table.h"
-#include "log.h"
 #include "types.h"
 #include "hash.h"
 #include <linux/ethtool.h>
@@ -212,7 +211,7 @@ int interface_tx(struct sk_buff *skb, struct net_device *dev)
                 * dropping */
                if (!spin_trylock(&orig_hash_lock)) {
                        lock_dropped++;
-                       debug_log(LOG_TYPE_NOTICE, "%d packets dropped because lock was hold\n", lock_dropped);
+                       printk(KERN_WARNING "batman-adv:%d packets dropped because lock was hold\n", lock_dropped);
                        goto dropped;
                }
 
index c2190e1..c7122da 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "main.h"
 #include "translation-table.h"
-#include "log.h"
 #include "soft-interface.h"
 #include "types.h"
 #include "hash.h"
@@ -82,12 +81,12 @@ void hna_local_add(uint8_t *addr)
           MAC-flooding. */
        if ((num_hna + 1 > (ETH_DATA_LEN - BAT_PACKET_LEN) / ETH_ALEN) ||
            (num_hna + 1 > 255)) {
-               debug_log(LOG_TYPE_ROUTES, "Can't add new local hna entry (%s): number of local hna entries exceeds packet size \n", hna_str);
+               bat_dbg(DBG_ROUTES, "Can't add new local hna entry (%s): number of local hna entries exceeds packet size \n", hna_str);
                return;
        }
 
-       debug_log(LOG_TYPE_ROUTES, "Creating new local hna entry: %s \n",
-                 hna_str);
+       bat_dbg(DBG_ROUTES, "Creating new local hna entry: %s \n",
+               hna_str);
 
        hna_local_entry = kmalloc(sizeof(struct hna_local_entry), GFP_ATOMIC);
        if (!hna_local_entry)
@@ -113,7 +112,7 @@ void hna_local_add(uint8_t *addr)
                                       hna_local_hash->size * 2);
 
                if (swaphash == NULL)
-                       debug_log(LOG_TYPE_CRIT, "Couldn't resize local hna hash table \n");
+                       printk(KERN_ERR "batman-adv:Couldn't resize local hna hash table \n");
                else
                        hna_local_hash = swaphash;
        }
@@ -205,8 +204,8 @@ static void hna_local_del(struct hna_local_entry *hna_local_entry,
        char hna_str[ETH_STR_LEN];
 
        addr_to_string(hna_str, hna_local_entry->addr);
-       debug_log(LOG_TYPE_ROUTES, "Deleting local hna entry (%s): %s \n",
-                 hna_str, message);
+       bat_dbg(DBG_ROUTES, "Deleting local hna entry (%s): %s \n",
+               hna_str, message);
 
        hash_remove(hna_local_hash, hna_local_entry->addr);
        _hna_local_del(hna_local_entry);
@@ -291,7 +290,9 @@ void hna_global_add_orig(struct orig_node *orig_node,
                        memcpy(hna_global_entry->addr, hna_ptr, ETH_ALEN);
 
                        addr_to_string(hna_str, hna_global_entry->addr);
-                       debug_log(LOG_TYPE_ROUTES, "Creating new global hna entry: %s (via %s)\n", hna_str, orig_str);
+                       bat_dbg(DBG_ROUTES,
+                               "Creating new global hna entry: %s (via %s)\n",
+                               hna_str, orig_str);
 
                        spin_lock_irqsave(&hna_global_hash_lock, flags);
                        hash_add(hna_global_hash, hna_global_entry);
@@ -333,7 +334,7 @@ void hna_global_add_orig(struct orig_node *orig_node,
                                       hna_global_hash->size * 2);
 
                if (swaphash == NULL)
-                       debug_log(LOG_TYPE_CRIT, "Couldn't resize global hna hash table \n");
+                       printk(KERN_ERR "batman-adv:Couldn't resize global hna hash table \n");
                else
                        hna_global_hash = swaphash;
        }
@@ -386,7 +387,8 @@ void _hna_global_del_orig(struct hna_global_entry *hna_global_entry,
        addr_to_string(orig_str, hna_global_entry->orig_node->orig);
        addr_to_string(hna_str, hna_global_entry->addr);
 
-       debug_log(LOG_TYPE_ROUTES, "Deleting global hna entry %s (via %s): %s \n", hna_str, orig_str, message);
+       bat_dbg(DBG_ROUTES, "Deleting global hna entry %s (via %s): %s \n",
+               hna_str, orig_str, message);
 
        hash_remove(hna_global_hash, hna_global_entry->addr);
        kfree(hna_global_entry);
index f6c9acb..cdb8aab 100644 (file)
@@ -23,7 +23,6 @@
 #include "send.h"
 #include "translation-table.h"
 #include "vis.h"
-#include "log.h"
 #include "soft-interface.h"
 #include "hard-interface.h"
 #include "hash.h"
@@ -445,8 +444,7 @@ static void send_vis_packet(struct vis_info *info)
        int packet_length;
 
        if (info->packet.ttl < 2) {
-               debug_log(LOG_TYPE_NOTICE,
-                         "Error - can't send vis packet: ttl exceeded\n");
+               printk(KERN_WARNING "batman-adv: Error - can't send vis packet: ttl exceeded\n");
                return;
        }
 
@@ -495,13 +493,13 @@ int vis_init(void)
 
        vis_hash = hash_new(256, vis_info_cmp, vis_info_choose);
        if (!vis_hash) {
-               debug_log(LOG_TYPE_CRIT, "Can't initialize vis_hash\n");
+               printk(KERN_ERR "batman-adv:Can't initialize vis_hash\n");
                goto err;
        }
 
        my_vis_info = kmalloc(1000, GFP_ATOMIC);
        if (!my_vis_info) {
-               debug_log(LOG_TYPE_CRIT, "Can't initialize vis packet\n");
+               printk(KERN_ERR "batman-adv:Can't initialize vis packet\n");
                goto err;
        }
 
@@ -522,8 +520,8 @@ int vis_init(void)
        memcpy(my_vis_info->packet.sender_orig, mainIfAddr, ETH_ALEN);
 
        if (hash_add(vis_hash, my_vis_info) < 0) {
-               debug_log(LOG_TYPE_CRIT,
-                         "Can't add own vis packet into hash\n");
+               printk(KERN_ERR
+                         "batman-adv:Can't add own vis packet into hash\n");
                free_info(my_vis_info); /* not in hash, need to remove it
                                         * manually. */
                goto err;