From: Marek Lindner <mareklindner@neomailbox.ch>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Antonio Quartulli <antonio@open-mesh.com>
Subject: [B.A.T.M.A.N.] [PATCH 12/13] batman-adv: B.A.T.M.A.N. V - implement bat_orig_print API
Date: Wed, 30 Dec 2015 20:40:13 +0800 [thread overview]
Message-ID: <1451479214-28034-12-git-send-email-mareklindner@neomailbox.ch> (raw)
In-Reply-To: <2457136.iz2mu7y0Mc@voltaire>
From: Antonio Quartulli <antonio@open-mesh.com>
Signed-off-by: Antonio Quartulli <antonio@open-mesh.com>
---
net/batman-adv/bat_v.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c
index 1ca7e65..3042583 100644
--- a/net/batman-adv/bat_v.c
+++ b/net/batman-adv/bat_v.c
@@ -22,11 +22,17 @@
#include <linux/bug.h>
#include <linux/cache.h>
#include <linux/init.h>
+#include <linux/jiffies.h>
+#include <linux/netdevice.h>
+#include <linux/rculist.h>
+#include <linux/rcupdate.h>
+#include <linux/seq_file.h>
#include <linux/types.h>
#include <linux/workqueue.h>
#include "bat_v_elp.h"
#include "bat_v_ogm.h"
+#include "hash.h"
#include "originator.h"
#include "packet.h"
@@ -81,6 +87,104 @@ static void batadv_v_ogm_emit(struct batadv_forw_packet *forw_packet)
{
}
+/**
+ * batadv_v_orig_print_neigh - print neighbors for the originator table
+ * @orig_node: the orig_node for which the neighbors are printed
+ * @if_outgoing: outgoing interface for these entries
+ * @seq: debugfs table seq_file struct
+ *
+ * Must be called while holding an rcu lock.
+ */
+static void
+batadv_v_orig_print_neigh(struct batadv_orig_node *orig_node,
+ struct batadv_hard_iface *if_outgoing,
+ struct seq_file *seq)
+{
+ struct batadv_neigh_node *neigh_node;
+ struct batadv_neigh_ifinfo *n_ifinfo;
+
+ hlist_for_each_entry_rcu(neigh_node, &orig_node->neigh_list, list) {
+ n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);
+ if (!n_ifinfo)
+ continue;
+
+ seq_printf(seq, " %pM (%9u.%1u)",
+ neigh_node->addr,
+ n_ifinfo->bat_v.throughput / 10,
+ n_ifinfo->bat_v.throughput % 10);
+
+ batadv_neigh_ifinfo_free_ref(n_ifinfo);
+ }
+}
+
+/**
+ * batadv_v_orig_print - print the originator table
+ * @bat_priv: the bat priv with all the soft interface information
+ * @seq: debugfs table seq_file struct
+ * @if_outgoing: the outgoing interface for which this should be printed
+ */
+static void batadv_v_orig_print(struct batadv_priv *bat_priv,
+ struct seq_file *seq,
+ struct batadv_hard_iface *if_outgoing)
+{
+ struct batadv_neigh_node *neigh_node;
+ struct batadv_hashtable *hash = bat_priv->orig_hash;
+ int last_seen_msecs, last_seen_secs;
+ struct batadv_orig_node *orig_node;
+ struct batadv_neigh_ifinfo *n_ifinfo;
+ unsigned long last_seen_jiffies;
+ struct hlist_head *head;
+ int batman_count = 0;
+ u32 i;
+
+ seq_printf(seq, " %-15s %s (%11s) %17s [%10s]: %20s ...\n",
+ "Originator", "last-seen", "throughput", "Nexthop",
+ "outgoingIF", "Potential nexthops");
+
+ for (i = 0; i < hash->size; i++) {
+ head = &hash->table[i];
+
+ rcu_read_lock();
+ hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
+ neigh_node = batadv_orig_router_get(orig_node,
+ if_outgoing);
+ if (!neigh_node)
+ continue;
+
+ n_ifinfo = batadv_neigh_ifinfo_get(neigh_node,
+ if_outgoing);
+ if (!n_ifinfo)
+ goto next;
+
+ last_seen_jiffies = jiffies - orig_node->last_seen;
+ last_seen_msecs = jiffies_to_msecs(last_seen_jiffies);
+ last_seen_secs = last_seen_msecs / 1000;
+ last_seen_msecs = last_seen_msecs % 1000;
+
+ seq_printf(seq, "%pM %4i.%03is (%9u.%1u) %pM [%10s]:",
+ orig_node->orig, last_seen_secs,
+ last_seen_msecs,
+ n_ifinfo->bat_v.throughput / 10,
+ n_ifinfo->bat_v.throughput % 10,
+ neigh_node->addr,
+ neigh_node->if_incoming->net_dev->name);
+
+ batadv_v_orig_print_neigh(orig_node, if_outgoing, seq);
+ seq_puts(seq, "\n");
+ batman_count++;
+
+next:
+ batadv_neigh_node_free_ref(neigh_node);
+ if (n_ifinfo)
+ batadv_neigh_ifinfo_free_ref(n_ifinfo);
+ }
+ rcu_read_unlock();
+ }
+
+ if (batman_count == 0)
+ seq_puts(seq, "No batman nodes in range ...\n");
+}
+
static int batadv_v_neigh_cmp(struct batadv_neigh_node *neigh1,
struct batadv_hard_iface *if_outgoing1,
struct batadv_neigh_node *neigh2,
@@ -123,6 +227,7 @@ static struct batadv_algo_ops batadv_batman_v __read_mostly = {
.bat_hardif_neigh_init = batadv_v_hardif_neigh_init,
.bat_ogm_emit = batadv_v_ogm_emit,
.bat_ogm_schedule = batadv_v_ogm_schedule,
+ .bat_orig_print = batadv_v_orig_print,
.bat_neigh_cmp = batadv_v_neigh_cmp,
.bat_neigh_is_similar_or_better = batadv_v_neigh_is_sob,
};
--
2.6.4
next prev parent reply other threads:[~2015-12-30 12:40 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-30 12:38 [B.A.T.M.A.N.] B.A.T.M.A.N. V leaves the nest Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 01/13] batman-adv: Add hard_iface specific sysfs wrapper macros for UINT Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 02/13] batman-adv: ELP - adding basic infrastructure Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 03/13] batman-adv: ELP - creating neighbor structures Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 04/13] batman-adv: ELP - adding sysfs parameter for elp interval Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 05/13] batman-adv: OGMv2 - add basic infrastructure Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 06/13] batman-adv: OGMv2 - implement originators logic Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 07/13] batman-adv: add throughput override attribute to hard_ifaces Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 08/13] batman-adv: keep track of when unicast packets are sent Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 09/13] batman-adv: ELP - compute the metric based on the estimated throughput Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 10/13] batman-adv: ELP - send unicast ELP packets for throughput sampling Marek Lindner
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 11/13] batman-adv: B.A.T.M.A.N. V - implement neighbor comparison API calls Marek Lindner
2015-12-30 12:40 ` Marek Lindner [this message]
2015-12-30 12:40 ` [B.A.T.M.A.N.] [PATCH 13/13] batman-adv: B.A.T.M.A.N. V - implement bat_neigh_print API Marek Lindner
2015-12-31 11:07 ` [B.A.T.M.A.N.] B.A.T.M.A.N. V leaves the nest Linus Lüssing
2016-01-04 13:08 ` Linus Lüssing
2016-01-09 2:29 ` Linus Lüssing
2016-01-09 13:43 ` Antonio Quartulli
2016-01-15 10:58 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1451479214-28034-12-git-send-email-mareklindner@neomailbox.ch \
--to=mareklindner@neomailbox.ch \
--cc=antonio@open-mesh.com \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).