batman-adv: export claim tables through debugfs

Signed-off-by: Simon Wunderlich <siwu@hrz.tu-chemnitz.de>
Signed-off-by: Antonio Quartulli <ordex@autistici.org>

diff --git a/Documentation/networking/batman-adv.txt b/Documentation/networking/batman-adv.txt
index 9523e9ed19e9b6704273423d74c9de0a28b53d6c..220a58c2fb1190d42b05a76a039e6254f85074a0 100644 (file)
--- a/Documentation/networking/batman-adv.txt
+++ b/Documentation/networking/batman-adv.txt
@@ -77,9 +77,8 @@ folder:
 There is a special folder for debugging information:
 
 #  ls /sys/kernel/debug/batman_adv/bat0/
-#  gateways     socket        transtable_global  vis_data
-#  originators  softif_neigh  transtable_local
-
+# bla_claim_table    log                socket             transtable_local
+# gateways           originators        transtable_global  vis_data
 
 Some of the files contain all sort of status information  regard-
 ing  the  mesh  network.  For  example, you can view the table of

diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
index 165ff62a2bed20eaf4b162c17fa727d098085c93..0e3517773a8bf83a7ba89f24f9eb25524b1cf72c 100644 (file)
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/bat_debugfs.c
@@ -32,6 +32,7 @@
 #include "soft-interface.h"
 #include "vis.h"
 #include "icmp_socket.h"
+#include "bridge_loop_avoidance.h"
 
 static struct dentry *bat_debugfs;
 
@@ -244,6 +245,13 @@ static int transtable_global_open(struct inode *inode, struct file *file)
        return single_open(file, tt_global_seq_print_text, net_dev);
 }
 
+static int bla_claim_table_open(struct inode *inode, struct file *file)
+{
+       struct net_device *net_dev = (struct net_device *)inode->i_private;
+       return single_open(file, bla_claim_table_seq_print_text, net_dev);
+}
+
+
 static int transtable_local_open(struct inode *inode, struct file *file)
 {
        struct net_device *net_dev = (struct net_device *)inode->i_private;
@@ -277,6 +285,7 @@ static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open);
 static BAT_DEBUGINFO(originators, S_IRUGO, originators_open);
 static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open);
 static BAT_DEBUGINFO(transtable_global, S_IRUGO, transtable_global_open);
+static BAT_DEBUGINFO(bla_claim_table, S_IRUGO, bla_claim_table_open);
 static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open);
 static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open);
 
@@ -284,6 +293,7 @@ static struct bat_debuginfo *mesh_debuginfos[] = {
        &bat_debuginfo_originators,
        &bat_debuginfo_gateways,
        &bat_debuginfo_transtable_global,
+       &bat_debuginfo_bla_claim_table,
        &bat_debuginfo_transtable_local,
        &bat_debuginfo_vis_data,
        NULL,

diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c
index f84c892be7ea0ba5fb116784bb61b89b5318e2fb..56b9b4924763adf39bf9ddfe61b912a74fb79510 100644 (file)
--- a/net/batman-adv/bridge_loop_avoidance.c
+++ b/net/batman-adv/bridge_loop_avoidance.c
@@ -1294,3 +1294,56 @@ out:
                claim_free_ref(claim);
        return ret;
 }
+
+int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset)
+{
+       struct net_device *net_dev = (struct net_device *)seq->private;
+       struct bat_priv *bat_priv = netdev_priv(net_dev);
+       struct hashtable_t *hash = bat_priv->claim_hash;
+       struct claim *claim;
+       struct hard_iface *primary_if;
+       struct hlist_node *node;
+       struct hlist_head *head;
+       uint32_t i;
+       bool is_own;
+       int ret = 0;
+
+       primary_if = primary_if_get_selected(bat_priv);
+       if (!primary_if) {
+               ret = seq_printf(seq,
+                                "BATMAN mesh %s disabled - please specify interfaces to enable it\n",
+                                net_dev->name);
+               goto out;
+       }
+
+       if (primary_if->if_status != IF_ACTIVE) {
+               ret = seq_printf(seq,
+                                "BATMAN mesh %s disabled - primary interface not active\n",
+                                net_dev->name);
+               goto out;
+       }
+
+       seq_printf(seq, "Claims announced for the mesh %s (orig %pM)\n",
+                  net_dev->name, primary_if->net_dev->dev_addr);
+       seq_printf(seq, "   %-17s    %-5s    %-17s [o] (%-4s)\n",
+                  "Client", "VID", "Originator", "CRC");
+       for (i = 0; i < hash->size; i++) {
+               head = &hash->table[i];
+
+               rcu_read_lock();
+               hlist_for_each_entry_rcu(claim, node, head, hash_entry) {
+                       is_own = compare_eth(claim->backbone_gw->orig,
+                                            primary_if->net_dev->dev_addr);
+                       seq_printf(seq, " * %pM on % 5d by %pM [%c] (%04x)\n",
+                                  claim->addr, claim->vid,
+                                  claim->backbone_gw->orig,
+                                  (is_own ? 'x' : ' '),
+                                  claim->backbone_gw->crc);
+               }
+               rcu_read_unlock();
+       }
+out:
+       if (primary_if)
+               hardif_free_ref(primary_if);
+       return ret;
+}

diff --git a/net/batman-adv/bridge_loop_avoidance.h b/net/batman-adv/bridge_loop_avoidance.h
index 488d77895d012b926dd085f7c6ad8edebd7cc020..d9e34803a4657e9c5c29f88fb86f9c3637c704cb 100644 (file)
--- a/net/batman-adv/bridge_loop_avoidance.h
+++ b/net/batman-adv/bridge_loop_avoidance.h
@@ -26,6 +26,7 @@ int bla_rx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
 int bla_tx(struct bat_priv *bat_priv, struct sk_buff *skb, short vid);
 int bla_is_backbone_gw(struct sk_buff *skb,
                       struct orig_node *orig_node, int hdr_size);
+int bla_claim_table_seq_print_text(struct seq_file *seq, void *offset);
 void bla_update_orig_address(struct bat_priv *bat_priv,
                             struct hard_iface *primary_if,
                             struct hard_iface *oldif);