Changeset 1594

Timestamp:

03/11/10 20:18:53 (6 months ago)

Author:

marek

Message:

batman-adv: convert multiple /proc files to use sysfs

This is the first patch in a series of patches which aim to convert
all batman-adv /proc files to sysfs. To keep the changes in a
digestable size it has been split up into smaller chunks. During
the transition period batman-adv will use /proc as well as sysfs.

As a first step the following files have been converted:
aggregate_ogm, bonding, originators, transtable_global, transtable_local

Signed-off-by: Marek Lindner <lindner_marek@…>

Location:

trunk/batman-adv-kernelland

Files:

• Makefile.kbuild (modified) (1 diff)
• aggregation.c (modified) (2 diffs)
• aggregation.h (modified) (1 diff)
• bat_sysfs.c (added)
• bat_sysfs.h (copied) (copied from trunk/batman-adv-kernelland/originator.h) (2 diffs)
• main.c (modified) (6 diffs)
• main.h (modified) (1 diff)
• originator.c (modified) (3 diffs)
• originator.h (modified) (1 diff)
• proc.c (modified) (12 diffs)
• proc.h (modified) (1 diff)
• routing.c (modified) (7 diffs)
• routing.h (modified) (1 diff)
• send.c (modified) (5 diffs)
• translation-table.c (modified) (6 diffs)
• translation-table.h (modified) (2 diffs)
• types.h (modified) (1 diff)

trunk/batman-adv-kernelland/Makefile.kbuild

@@ -33 +33 @@
 
 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 originator.o gateway_common.o gateway_client.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o)
+batman-adv-objs := main.o proc.o bat_sysfs.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 originator.o gateway_common.o gateway_client.o $(shell [ "2" -eq "$(VERSION)" ] 2>&- && [ "6" -eq "$(PATCHLEVEL)" ] 2>&- && [ "$(SUBLEVEL)" -le "28" ] 2>&- && echo bat_printk.o)

trunk/batman-adv-kernelland/aggregation.c

@@ -160 +160 @@
 void add_bat_packet_to_list(unsigned char *packet_buff, int packet_len,
                             struct batman_if *if_incoming, char own_packet,
-                            unsigned long send_time)
+                            unsigned long send_time,
+                            struct bat_priv *bat_priv)
 {
         /**
@@ -176 +177 @@
         spin_lock_irqsave(&forw_bat_list_lock, flags);
         /* own packets are not to be aggregated */
-        if ((atomic_read(&aggregation_enabled)) && (!own_packet)) {
+        if ((atomic_read(&bat_priv->aggregation_enabled)) && (!own_packet)) {
                 hlist_for_each_entry(forw_packet_pos, tmp_node, &forw_bat_list,
                                      list) {

trunk/batman-adv-kernelland/aggregation.h

@@ -33 +33 @@
 void add_bat_packet_to_list(unsigned char *packet_buff, int packet_len,
                             struct batman_if *if_outgoing, char own_packet,
-                            unsigned long send_time);
+                            unsigned long send_time,
+                            struct bat_priv *bat_priv);
 void receive_aggr_bat_packet(struct ethhdr *ethhdr, unsigned char *packet_buff,
                              int packet_len, struct batman_if *if_incoming);

trunk/batman-adv-kernelland/bat_sysfs.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors:
+ * Copyright (C) 2010 B.A.T.M.A.N. contributors:
  *
- * Marek Lindner, Simon Wunderlich
+ * Marek Lindner
  *
  * This program is free software; you can redistribute it and/or
@@ -20 +20 @@
  */
 
-int originator_init(void);
-void free_orig_node(void *data);
-void originator_free(void);
-void purge_orig(struct work_struct *work);
-struct orig_node *orig_find(char *mac);
-struct orig_node *get_orig_node(uint8_t *addr);
-struct neigh_node *
-create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
-                uint8_t *neigh, struct batman_if *if_incoming);
+
+#define SYSFS_IF_MESH_SUBDIR "mesh"
+
+int sysfs_add_meshif(struct net_device *dev);
+void sysfs_del_meshif(struct net_device *dev);

trunk/batman-adv-kernelland/main.c

@@ -22 +22 @@
 #include "main.h"
 #include "proc.h"
+#include "bat_sysfs.h"
 #include "routing.h"
 #include "send.h"
@@ -48 +49 @@
 atomic_t vis_interval;
 atomic_t vis_mode;
-atomic_t aggregation_enabled;
-atomic_t bonding_enabled;
 int16_t num_hna;
 int16_t num_ifs;
@@ -90 +89 @@
                                          * for debugging now. */
         atomic_set(&vis_mode, VIS_TYPE_CLIENT_UPDATE);
-        atomic_set(&aggregation_enabled, 1);
-        atomic_set(&bonding_enabled, 0);
         atomic_set(&gw_mode, GW_MODE_OFF);
         atomic_set(&gw_srv_class, 0);
@@ -125 +122 @@
         }
 
+        retval = sysfs_add_meshif(soft_device);
+
+        if (retval < 0)
+                goto unreg_soft_device;
+
         register_netdevice_notifier(&hard_if_notifier);
         dev_add_pack(&batman_adv_packet_type);
@@ -133 +135 @@
         return 0;
 
+unreg_soft_device:
+        unregister_netdevice(soft_device);
 free_soft_device:
         free_netdev(soft_device);
@@ -145 +149 @@
 
         if (soft_device) {
+                sysfs_del_meshif(soft_device);
                 unregister_netdev(soft_device);
                 soft_device = NULL;

trunk/batman-adv-kernelland/main.h

@@ -137 +137 @@
 extern atomic_t vis_interval;
 extern atomic_t vis_mode;
-extern atomic_t aggregation_enabled;
 extern atomic_t bonding_enabled;
 extern int16_t num_hna;

trunk/batman-adv-kernelland/originator.c

@@ -211 +211 @@
 static bool purge_orig_node(struct orig_node *orig_node)
 {
+        /* FIXME: each batman_if will be attached to a softif */
+        struct bat_priv *bat_priv = netdev_priv(soft_device);
         struct neigh_node *best_neigh_node;
 
@@ -228 +230 @@
                         /* update bonding candidates, we could have lost
                          * some candidates. */
-                        update_bonding_candidates(orig_node);
+                        update_bonding_candidates(orig_node, bat_priv);
                 }
         }
@@ -259 +261 @@
         start_purge_timer();
 }
+
+ssize_t orig_fill_buffer_text(char *buff, size_t count, loff_t off)
+{
+        HASHIT(hashit);
+        struct orig_node *orig_node;
+        struct neigh_node *neigh_node;
+        size_t hdr_len, tmp_len;
+        int batman_count = 0, bytes_written = 0;
+        unsigned long flags;
+        char orig_str[ETH_STR_LEN], router_str[ETH_STR_LEN];
+
+        rcu_read_lock();
+        hdr_len = sprintf(buff,
+                   "  %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s] \n",
+                   "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
+                   "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR,
+                   ((struct batman_if *)if_list.next)->dev,
+                   ((struct batman_if *)if_list.next)->addr_str);
+        rcu_read_unlock();
+
+        if (off < hdr_len)
+                bytes_written = hdr_len;
+
+        spin_lock_irqsave(&orig_hash_lock, flags);
+
+        while (hash_iterate(orig_hash, &hashit)) {
+
+                orig_node = hashit.bucket->data;
+
+                if (!orig_node->router)
+                        continue;
+
+                if (orig_node->router->tq_avg == 0)
+                        continue;
+
+                /* estimated line length */
+                if (count < bytes_written + 200)
+                        break;
+
+                addr_to_string(orig_str, orig_node->orig);
+                addr_to_string(router_str, orig_node->router->addr);
+
+                tmp_len = sprintf(buff + bytes_written,
+                                  "%-17s  (%3i) %17s [%10s]:",
+                                   orig_str, orig_node->router->tq_avg,
+                                   router_str,
+                                   orig_node->router->if_incoming->dev);
+
+                list_for_each_entry(neigh_node, &orig_node->neigh_list, list) {
+                        addr_to_string(orig_str, neigh_node->addr);
+                        tmp_len += sprintf(buff + bytes_written + tmp_len,
+                                           " %17s (%3i)", orig_str,
+                                           neigh_node->tq_avg);
+                }
+
+                tmp_len += sprintf(buff + bytes_written + tmp_len, "\n");
+
+                batman_count++;
+                hdr_len += tmp_len;
+
+                if (off >= hdr_len)
+                        continue;
+
+                bytes_written += tmp_len;
+        }
+
+        spin_unlock_irqrestore(&orig_hash_lock, flags);
+
+        if ((batman_count == 0) && (off == 0))
+                bytes_written += sprintf(buff + bytes_written,
+                                        "No batman nodes in range ... \n");
+
+        return bytes_written;
+}

trunk/batman-adv-kernelland/originator.h

@@ -29 +29 @@
 create_neighbor(struct orig_node *orig_node, struct orig_node *orig_neigh_node,
                 uint8_t *neigh, struct batman_if *if_incoming);
+ssize_t orig_fill_buffer_text(char *buff, size_t count, loff_t off);

trunk/batman-adv-kernelland/proc.c

@@ -33 +33 @@
 
 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_transt_local_file;
-static struct proc_dir_entry *proc_transt_global_file;
+static struct proc_dir_entry *proc_orig_interval_file;
 static struct proc_dir_entry *proc_vis_srv_file, *proc_vis_data_file;
-static struct proc_dir_entry *proc_aggr_file, *proc_bond_file;
 static struct proc_dir_entry *proc_gw_mode_file, *proc_gw_srv_list_file;
 
@@ -179 +176 @@
 {
         return single_open(file, proc_orig_interval_read, NULL);
-}
-
-static int proc_originators_read(struct seq_file *seq, void *offset)
-{
-        HASHIT(hashit);
-        struct orig_node *orig_node;
-        struct neigh_node *neigh_node;
-        int batman_count = 0;
-        char orig_str[ETH_STR_LEN], router_str[ETH_STR_LEN];
-        unsigned long flags;
-
-        rcu_read_lock();
-        if (list_empty(&if_list)) {
-                rcu_read_unlock();
-                seq_printf(seq, "BATMAN disabled - please specify interfaces to enable it \n");
-                goto end;
-        }
-
-        if (((struct batman_if *)if_list.next)->if_active != IF_ACTIVE) {
-                rcu_read_unlock();
-                seq_printf(seq, "BATMAN disabled - primary interface not active \n");
-                goto end;
-        }
-
-        seq_printf(seq,
-                   "  %-14s (%s/%i) %17s [%10s]: %20s ... [B.A.T.M.A.N. adv %s%s, MainIF/MAC: %s/%s] \n",
-                   "Originator", "#", TQ_MAX_VALUE, "Nexthop", "outgoingIF",
-                   "Potential nexthops", SOURCE_VERSION, REVISION_VERSION_STR,
-                   ((struct batman_if *)if_list.next)->dev,
-                   ((struct batman_if *)if_list.next)->addr_str);
-
-        rcu_read_unlock();
-        spin_lock_irqsave(&orig_hash_lock, flags);
-
-        while (hash_iterate(orig_hash, &hashit)) {
-
-                orig_node = hashit.bucket->data;
-
-                if (!orig_node->router)
-                        continue;
-
-                if (orig_node->router->tq_avg == 0)
-                        continue;
-
-                batman_count++;
-
-                addr_to_string(orig_str, orig_node->orig);
-                addr_to_string(router_str, orig_node->router->addr);
-
-                seq_printf(seq, "%-17s  (%3i) %17s [%10s]:",
-                           orig_str, orig_node->router->tq_avg,
-                           router_str, orig_node->router->if_incoming->dev);
-
-                list_for_each_entry(neigh_node, &orig_node->neigh_list, list) {
-                        addr_to_string(orig_str, neigh_node->addr);
-                        seq_printf(seq, " %17s (%3i)",
-                                   orig_str, neigh_node->tq_avg);
-                }
-
-                seq_printf(seq, "\n");
-
-        }
-
-        spin_unlock_irqrestore(&orig_hash_lock, flags);
-
-        if (batman_count == 0)
-                seq_printf(seq, "No batman nodes in range ... \n");
-
-end:
-        return 0;
-}
-
-static int proc_originators_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_originators_read, NULL);
-}
-
-static int proc_transt_local_read(struct seq_file *seq, void *offset)
-{
-        char *buf;
-
-        buf = kmalloc(4096, GFP_KERNEL);
-        if (!buf)
-                return 0;
-
-        rcu_read_lock();
-        if (list_empty(&if_list)) {
-                rcu_read_unlock();
-                seq_printf(seq, "BATMAN disabled - please specify interfaces to enable it \n");
-                goto end;
-        }
-
-        rcu_read_unlock();
-
-        seq_printf(seq, "Locally retrieved addresses (from %s) announced via HNA:\n", soft_device->name);
-
-        hna_local_fill_buffer_text(buf, 4096);
-        seq_printf(seq, "%s", buf);
-
-end:
-        kfree(buf);
-        return 0;
-}
-
-static int proc_transt_local_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_transt_local_read, NULL);
-}
-
-static int proc_transt_global_read(struct seq_file *seq, void *offset)
-{
-        char *buf;
-
-        buf = kmalloc(4096, GFP_KERNEL);
-        if (!buf)
-                return 0;
-
-        rcu_read_lock();
-        if (list_empty(&if_list)) {
-                rcu_read_unlock();
-                seq_printf(seq, "BATMAN disabled - please specify interfaces to enable it \n");
-                goto end;
-        }
-        rcu_read_unlock();
-
-
-        seq_printf(seq, "Globally announced HNAs received via the mesh (translation table):\n");
-
-        hna_global_fill_buffer_text(buf, 4096);
-        seq_printf(seq, "%s", buf);
-
-end:
-        kfree(buf);
-        return 0;
-}
-
-static int proc_transt_global_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_transt_global_read, NULL);
 }
 
@@ -434 +292 @@
 }
 
-static int proc_aggr_read(struct seq_file *seq, void *offset)
-{
-        seq_printf(seq, "%i\n", atomic_read(&aggregation_enabled));
-
-        return 0;
-}
-
-static ssize_t proc_aggr_write(struct file *file, const char __user *buffer,
-                               size_t count, loff_t *ppos)
-{
-        char *aggr_string;
-        int not_copied = 0;
-        unsigned long aggregation_enabled_tmp;
-        int retval;
-
-        aggr_string = kmalloc(count, GFP_KERNEL);
-
-        if (!aggr_string)
-                return -ENOMEM;
-
-        not_copied = copy_from_user(aggr_string, buffer, count);
-        aggr_string[count - not_copied - 1] = 0;
-
-        retval = strict_strtoul(aggr_string, 10, &aggregation_enabled_tmp);
-
-        if (retval || aggregation_enabled_tmp > 1) {
-                printk(KERN_ERR "batman-adv:Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp);
-        } else {
-                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);
-        }
-
-        kfree(aggr_string);
-        return count;
-}
-
-static int proc_aggr_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_aggr_read, NULL);
-}
-
 static int proc_gw_mode_read(struct seq_file *seq, void *offset)
 {
@@ -573 +384 @@
 }
 
-
-static int proc_bond_read(struct seq_file *seq, void *offset)
-{
-        seq_printf(seq, "%i\n", atomic_read(&bonding_enabled));
-
-        return 0;
-}
-
-static ssize_t proc_bond_write(struct file *file, const char __user *buffer,
-                               size_t count, loff_t *ppos)
-{
-        char *bond_string;
-        int not_copied = 0;
-        unsigned long bonding_enabled_tmp;
-        int retval;
-
-        bond_string = kmalloc(count, GFP_KERNEL);
-
-        if (!bond_string)
-                return -ENOMEM;
-
-        not_copied = copy_from_user(bond_string, buffer, count);
-        bond_string[count - not_copied - 1] = 0;
-
-        retval = strict_strtoul(bond_string, 10, &bonding_enabled_tmp);
-
-        if (retval || bonding_enabled_tmp > 1) {
-                printk(KERN_ERR "batman-adv: Bonding can only be enabled (1) or disabled (0), given value: %li\n", bonding_enabled_tmp);
-        } else {
-                printk(KERN_INFO "batman-adv:Changing bonding from: %s (%i) to: %s (%li)\n",
-                       (atomic_read(&bonding_enabled) == 1 ?
-                        "enabled" : "disabled"),
-                       atomic_read(&bonding_enabled),
-                       (bonding_enabled_tmp == 1 ? "enabled" : "disabled"),
-                       bonding_enabled_tmp);
-                atomic_set(&bonding_enabled,
-                                                (unsigned)bonding_enabled_tmp);
-        }
-
-        kfree(bond_string);
-        return count;
-}
-
-static int proc_bond_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, proc_bond_read, NULL);
-}
-
 /* satisfying different prototypes ... */
 static ssize_t proc_dummy_write(struct file *file, const char __user *buffer,
@@ -646 +409 @@
 };
 
-static const struct file_operations proc_aggr_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_aggr_open,
-        .read           = seq_read,
-        .write          = proc_aggr_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_bond_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_bond_open,
-        .read           = seq_read,
-        .write          = proc_bond_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct file_operations proc_vis_srv_fops = {
         .owner          = THIS_MODULE,
@@ -682 +427 @@
 };
 
-static const struct file_operations proc_originators_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_originators_open,
-        .read           = seq_read,
-        .write          = proc_dummy_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_transt_local_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_transt_local_open,
-        .read           = seq_read,
-        .write          = proc_dummy_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
-static const struct file_operations proc_transt_global_fops = {
-        .owner          = THIS_MODULE,
-        .open           = proc_transt_global_open,
-        .read           = seq_read,
-        .write          = proc_dummy_write,
-        .llseek         = seq_lseek,
-        .release        = single_release,
-};
-
 static const struct file_operations proc_interfaces_fops = {
         .owner          = THIS_MODULE,
@@ -729 +447 @@
 void cleanup_procfs(void)
 {
-        if (proc_transt_global_file)
-                remove_proc_entry(PROC_FILE_TRANST_GLOBAL, proc_batman_dir);
-
-        if (proc_transt_local_file)
-                remove_proc_entry(PROC_FILE_TRANST_LOCAL, proc_batman_dir);
-
-        if (proc_originators_file)
-                remove_proc_entry(PROC_FILE_ORIGINATORS, proc_batman_dir);
-
         if (proc_orig_interval_file)
                 remove_proc_entry(PROC_FILE_ORIG_INTERVAL, proc_batman_dir);
@@ -750 +459 @@
                 remove_proc_entry(PROC_FILE_VIS_SRV, proc_batman_dir);
 
-        if (proc_aggr_file)
-                remove_proc_entry(PROC_FILE_AGGR, proc_batman_dir);
-
         if (proc_gw_mode_file)
                 remove_proc_entry(PROC_FILE_GW_MODE, proc_batman_dir);
@@ -758 +464 @@
         if (proc_gw_srv_list_file)
                 remove_proc_entry(PROC_FILE_GW_SRV_LIST, proc_batman_dir);
-
-        if (proc_bond_file)
-                remove_proc_entry(PROC_FILE_BOND, proc_batman_dir);
-
 
         if (proc_batman_dir)
@@ -806 +508 @@
         }
 
-        proc_originators_file = create_proc_entry(PROC_FILE_ORIGINATORS,
-                                                  S_IRUGO, proc_batman_dir);
-        if (proc_originators_file) {
-                proc_originators_file->proc_fops = &proc_originators_fops;
-        } else {
-                printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_ORIGINATORS);
-                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) {
-                proc_transt_local_file->proc_fops = &proc_transt_local_fops;
-        } else {
-                printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_LOCAL);
-                cleanup_procfs();
-                return -EFAULT;
-        }
-
-        proc_transt_global_file = create_proc_entry(PROC_FILE_TRANST_GLOBAL,
-                                                    S_IRUGO, proc_batman_dir);
-        if (proc_transt_global_file) {
-                proc_transt_global_file->proc_fops = &proc_transt_global_fops;
-        } else {
-                printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_GLOBAL);
-                cleanup_procfs();
-                return -EFAULT;
-        }
-
         proc_vis_srv_file = create_proc_entry(PROC_FILE_VIS_SRV,
                                                 S_IWUSR | S_IRUGO,
@@ -853 +525 @@
         } else {
                 printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_DATA);
-                cleanup_procfs();
-                return -EFAULT;
-        }
-
-        proc_aggr_file = create_proc_entry(PROC_FILE_AGGR, S_IWUSR | S_IRUGO,
-                                           proc_batman_dir);
-        if (proc_aggr_file) {
-                proc_aggr_file->proc_fops = &proc_aggr_fops;
-        } else {
-                printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_AGGR);
                 cleanup_procfs();
                 return -EFAULT;
@@ -891 +553 @@
         }
 
-        proc_bond_file = create_proc_entry(PROC_FILE_BOND, S_IWUSR | S_IRUGO,
-                                           proc_batman_dir);
-        if (proc_bond_file) {
-                proc_bond_file->proc_fops = &proc_bond_fops;
-        } else {
-                printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_BOND);
-                cleanup_procfs();
-                return -EFAULT;
-        }
-
-        return 0;
-}
+        return 0;
+}

trunk/batman-adv-kernelland/proc.h

@@ -26 +26 @@
 #define PROC_FILE_INTERFACES "interfaces"
 #define PROC_FILE_ORIG_INTERVAL "orig_interval"
-#define PROC_FILE_ORIGINATORS "originators"
 #define PROC_FILE_GATEWAYS "gateways"
 #define PROC_FILE_LOG "log"
 #define PROC_FILE_LOG_LEVEL "log_level"
-#define PROC_FILE_TRANST_LOCAL "transtable_local"
-#define PROC_FILE_TRANST_GLOBAL "transtable_global"
 #define PROC_FILE_VIS_SRV "vis_server"
 #define PROC_FILE_VIS_DATA "vis_data"
-#define PROC_FILE_AGGR "aggregate_ogm"
-#define PROC_FILE_BOND "bonding"
 #define PROC_FILE_GW_MODE "gateway_mode"
 #define PROC_FILE_GW_SRV_LIST "gateway_srv_list"

trunk/batman-adv-kernelland/routing.c

@@ -364 +364 @@
 /* copy primary address for bonding */
 static void mark_bonding_address(struct orig_node *orig_node,
-                                struct orig_node *orig_neigh_node,
-                                struct batman_packet *batman_packet)
+                                 struct orig_node *orig_neigh_node,
+                                 struct batman_packet *batman_packet,
+                                 struct bat_priv *bat_priv)
 
 {
         /* don't care if bonding is not enabled */
-        if (!atomic_read(&bonding_enabled)) {
+        if (!atomic_read(&bat_priv->bonding_enabled)) {
                 orig_node->bond.candidates = 0;
                 return;
@@ -376 +377 @@
         if (batman_packet->flags & PRIMARIES_FIRST_HOP)
                 memcpy(orig_neigh_node->primary_addr,
-                                                orig_node->orig, ETH_ALEN);
-         else
-                return;
+                       orig_node->orig, ETH_ALEN);
+
+        return;
 }
 
 /* mark possible bonding candidates in the neighbor list */
-void update_bonding_candidates(struct orig_node *orig_node)
+void update_bonding_candidates(struct orig_node *orig_node,
+                               struct bat_priv *bat_priv)
 {
         int candidates;
@@ -388 +390 @@
         int best_tq;
         struct neigh_node *tmp_neigh_node, *tmp_neigh_node2;
-    struct neigh_node *first_candidate, *last_candidate;
+        struct neigh_node *first_candidate, *last_candidate;
 
         /* don't care if bonding is not enabled */
-        if (!atomic_read(&bonding_enabled)) {
+        if (!atomic_read(&bat_priv->bonding_enabled)) {
                 orig_node->bond.candidates = 0;
                 return;
@@ -478 +480 @@
                                 struct batman_if *if_incoming)
 {
+        /* FIXME: each orig_node->batman_if will be attached to a softif */
+        struct bat_priv *bat_priv = netdev_priv(soft_device);
         struct batman_if *batman_if;
         struct orig_node *orig_neigh_node, *orig_node;
@@ -639 +643 @@
                             if_incoming, hna_buff, hna_buff_len, is_duplicate);
 
-        mark_bonding_address(orig_node, orig_neigh_node, batman_packet);
-        update_bonding_candidates(orig_node);
+        mark_bonding_address(orig_node, orig_neigh_node,
+                             batman_packet, bat_priv);
+        update_bonding_candidates(orig_node, bat_priv);
 
         /* is single hop (direct) neighbor */
@@ -929 +934 @@
 struct neigh_node *find_router(struct orig_node *orig_node)
 {
+        /* FIXME: each orig_node->batman_if will be attached to a softif */
+        struct bat_priv *bat_priv = netdev_priv(soft_device);
         struct orig_node *primary_orig_node;
         struct orig_node *router_orig;
@@ -941 +948 @@
 
         /* don't care if bonding is not enabled */
-        if (!atomic_read(&bonding_enabled))
+        if (!atomic_read(&bat_priv->bonding_enabled))
                 return orig_node->router;
 

trunk/batman-adv-kernelland/routing.h

@@ -39 +39 @@
                                 struct batman_if *batman_if);
 struct neigh_node *find_router(struct orig_node *orig_node);
-void update_bonding_candidates(struct orig_node *orig_node);
+void update_bonding_candidates(struct orig_node *orig_node,
+                               struct bat_priv *bat_priv);

trunk/batman-adv-kernelland/send.c

@@ -48 +48 @@
 
 /* when do we schedule a forwarded packet to be sent */
-static unsigned long forward_send_time(void)
+static unsigned long forward_send_time(struct bat_priv *bat_priv)
 {
         unsigned long send_time = jiffies; /* Starting now plus... */
 
-        if (atomic_read(&aggregation_enabled))
+        if (atomic_read(&bat_priv->aggregation_enabled))
                 send_time += (((MAX_AGGREGATION_MS - (JITTER/2) +
                                 (random32() % JITTER)) * HZ) / 1000);
@@ -250 +250 @@
 void schedule_own_packet(struct batman_if *batman_if)
 {
+        /* FIXME: each batman_if will be attached to a softif */
+        struct bat_priv *bat_priv = netdev_priv(soft_device);
         unsigned long send_time;
         struct batman_packet *batman_packet;
@@ -290 +292 @@
         send_time = own_send_time();
         add_bat_packet_to_list(batman_if->packet_buff,
-                               batman_if->packet_len, batman_if, 1, send_time);
+                               batman_if->packet_len,
+                               batman_if, 1, send_time,
+                               bat_priv);
 }
 
@@ -299 +303 @@
                              struct batman_if *if_incoming)
 {
+        /* FIXME: each batman_if will be attached to a softif */
+        struct bat_priv *bat_priv = netdev_priv(soft_device);
         unsigned char in_tq, in_ttl, tq_avg = 0;
         unsigned long send_time;
@@ -344 +350 @@
                 batman_packet->flags &= ~DIRECTLINK;
 
-        send_time = forward_send_time();
+        send_time = forward_send_time(bat_priv);
         add_bat_packet_to_list((unsigned char *)batman_packet,
                                sizeof(struct batman_packet) + hna_buff_len,
-                               if_incoming, 0, send_time);
+                               if_incoming, 0, send_time,
+                               bat_priv);
 }
 

trunk/batman-adv-kernelland/translation-table.c

@@ -158 +158 @@
 }
 
-int hna_local_fill_buffer_text(unsigned char *buff, int buff_len)
+int hna_local_fill_buffer_text(struct net_device *net_dev, char *buff,
+                               size_t count, loff_t off)
 {
         struct hna_local_entry *hna_local_entry;
@@ -164 +165 @@
         int bytes_written = 0;
         unsigned long flags;
+        size_t hdr_len;
+
+        hdr_len = sprintf(buff,
+                          "Locally retrieved addresses (from %s) announced via HNA:\n",
+                          net_dev->name);
+
+        if (off < hdr_len)
+                bytes_written = hdr_len;
 
         spin_lock_irqsave(&hna_local_hash_lock, flags);
 
         while (hash_iterate(hna_local_hash, &hashit)) {
-
-                if (buff_len < bytes_written + ETH_STR_LEN + 4)
+                hdr_len += 21;
+
+                if (count < bytes_written + 22)
                         break;
 
+                if (off >= hdr_len)
+                        continue;
+
                 hna_local_entry = hashit.bucket->data;
 
-                bytes_written += snprintf(buff + bytes_written, ETH_STR_LEN + 4,
+                bytes_written += snprintf(buff + bytes_written, 22,
                                           " * %02x:%02x:%02x:%02x:%02x:%02x\n",
                                           hna_local_entry->addr[0],
@@ -185 +198 @@
 
         spin_unlock_irqrestore(&hna_local_hash_lock, flags);
-
         return bytes_written;
 }
@@ -350 +362 @@
 }
 
-int hna_global_fill_buffer_text(unsigned char *buff, int buff_len)
+int hna_global_fill_buffer_text(struct net_device *net_dev, char *buff,
+                                size_t count, loff_t off)
 {
         struct hna_global_entry *hna_global_entry;
@@ -356 +369 @@
         int bytes_written = 0;
         unsigned long flags;
+        size_t hdr_len;
+
+        hdr_len = sprintf(buff,
+                          "Globally announced HNAs received via the mesh %s (translation table):\n",
+                          net_dev->name);
+
+        if (off < hdr_len)
+                bytes_written = hdr_len;
 
         spin_lock_irqsave(&hna_global_hash_lock, flags);
 
         while (hash_iterate(hna_global_hash, &hashit)) {
-                if (buff_len < bytes_written + (2 * ETH_STR_LEN) + 10)
+                hdr_len += 43;
+
+                if (count < bytes_written + 44)
                         break;
 
+                if (off >= hdr_len)
+                        continue;
+
                 hna_global_entry = hashit.bucket->data;
 
-                bytes_written += snprintf(buff + bytes_written,
-                                          (2 * ETH_STR_LEN) + 10,
-                                          " * %02x:%02x:%02x:%02x:%02x:%02x via %02x:%02x:%02x:%02x:%02x:%02x \n",
+                bytes_written += snprintf(buff + bytes_written, 44,
+                                          " * %02x:%02x:%02x:%02x:%02x:%02x via %02x:%02x:%02x:%02x:%02x:%02x\n",
                                           hna_global_entry->addr[0],
                                           hna_global_entry->addr[1],
@@ -383 +408 @@
 
         spin_unlock_irqrestore(&hna_global_hash_lock, flags);
-
         return bytes_written;
 }

trunk/batman-adv-kernelland/translation-table.h

@@ -26 +26 @@
 void hna_local_remove(uint8_t *addr, char *message);
 int hna_local_fill_buffer(unsigned char *buff, int buff_len);
-int hna_local_fill_buffer_text(unsigned char *buff, int buff_len);
+int hna_local_fill_buffer_text(struct net_device *net_dev, char *buff,
+                               size_t count, loff_t off);
 void hna_local_purge(struct work_struct *work);
 void hna_local_free(void);
@@ -32 +33 @@
 void hna_global_add_orig(struct orig_node *orig_node, unsigned char *hna_buff,
                          int hna_buff_len);
-int hna_global_fill_buffer_text(unsigned char *buff, int buff_len);
+int hna_global_fill_buffer_text(struct net_device *net_dev, char *buff,
+                                size_t count, loff_t off);
 void _hna_global_del_orig(struct hna_global_entry *hna_global_entry,
                           char *orig_str);

trunk/batman-adv-kernelland/types.h

@@ -95 +95 @@
 struct bat_priv {
         struct net_device_stats stats;
+        atomic_t aggregation_enabled;
+        atomic_t bonding_enabled;
+        struct kobject *mesh_obj;
 };