Changeset 1589 for trunk/batman-adv-kernelland/vis.c

Timestamp:

03/10/10 22:48:40 (6 months ago)

Author:

marek

Message:

batman-adv: Fix VIS output bug for secondary interfaces

TQ and HNA records for originators on secondary interfaces were
wrongly being included on the primary interface. Ensure we output a
line for each source interface on every node, so we correctly separate
primary and secondary interface records.

Signed-off-by: Linus Luessing <linus.luessing@…>

Files:

• trunk/batman-adv-kernelland/vis.c (modified) (3 diffs)

trunk/batman-adv-kernelland/vis.c

@@ -88 +88 @@
 /* insert interface to the list of interfaces of one originator, if it
  * does not already exist in the list */
-static void proc_vis_insert_interface(const uint8_t *interface,
+void proc_vis_insert_interface(const uint8_t *interface,
                                       struct hlist_head *if_list,
                                       bool primary)
@@ -113 +113 @@
 {
         struct if_list_entry *entry;
-        struct hlist_node *pos, *n;
+        struct hlist_node *pos;
         char tmp_addr_str[ETH_STR_LEN];
 
-        hlist_for_each_entry_safe(entry, pos, n, if_list, list) {
-                if (entry->primary) {
+        hlist_for_each_entry(entry, pos, if_list, list) {
+                if (entry->primary)
                         seq_printf(seq, "PRIMARY, ");
-                } else {
+                else {
                         addr_to_string(tmp_addr_str, entry->addr);
                         seq_printf(seq, "SEC %s, ", tmp_addr_str);
                 }
-
-                hlist_del(&entry->list);
-                kfree(entry);
         }
 }
@@ -132 +129 @@
 void proc_vis_read_entry(struct seq_file *seq,
                                 struct vis_info_entry *entry,
-                                struct hlist_head *if_list,
-                                uint8_t *vis_orig)
+                                uint8_t *src,
+                                bool primary)
 {
         char to[40];
 
         addr_to_string(to, entry->dest);
-        if (entry->quality == 0) {
-                proc_vis_insert_interface(vis_orig, if_list, true);
+        if (primary && entry->quality == 0)
                 seq_printf(seq, "HNA %s, ", to);
-        } else {
-                proc_vis_insert_interface(entry->src, if_list,
-                                          compare_orig(entry->src, vis_orig));
+        else if (compare_orig(entry->src, src))
                 seq_printf(seq, "TQ %s %d, ", to, entry->quality);
-        }
 }