From: Simon Wunderlich <sw@simonwunderlich.de>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org,
Andrew Lunn <andrew@lunn.ch>,
Sven Eckelmann <sven.eckelmann@open-mesh.com>,
Simon Wunderlich <sw@simonwunderlich.de>,
Marek Lindner <mareklindner@neomailbox.ch>
Subject: [PATCH 11/16] batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations
Date: Tue, 16 Aug 2016 10:32:39 +0200 [thread overview]
Message-ID: <1471336364-16334-12-git-send-email-sw@simonwunderlich.de> (raw)
In-Reply-To: <1471336364-16334-1-git-send-email-sw@simonwunderlich.de>
From: Andrew Lunn <andrew@lunn.ch>
Dump the list of gateways via the netlink socket.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
[sven.eckelmann@open-mesh.com: integrate in batadv_algo_ops]
Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
---
net/batman-adv/bat_iv_ogm.c | 105 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 105 insertions(+)
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 7a8c0f6..9ed4f1f 100644
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/bat_iv_ogm.c
@@ -2681,6 +2681,110 @@ static void batadv_iv_gw_print(struct batadv_priv *bat_priv,
seq_puts(seq, "No gateways in range ...\n");
}
+/**
+ * batadv_iv_gw_dump_entry - Dump a gateway into a message
+ * @msg: Netlink message to dump into
+ * @portid: Port making netlink request
+ * @seq: Sequence number of netlink message
+ * @bat_priv: The bat priv with all the soft interface information
+ * @gw_node: Gateway to be dumped
+ *
+ * Return: Error code, or 0 on success
+ */
+static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
+ struct batadv_priv *bat_priv,
+ struct batadv_gw_node *gw_node)
+{
+ struct batadv_neigh_ifinfo *router_ifinfo = NULL;
+ struct batadv_neigh_node *router;
+ struct batadv_gw_node *curr_gw;
+ int ret = -EINVAL;
+ void *hdr;
+
+ router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);
+ if (!router)
+ goto out;
+
+ router_ifinfo = batadv_neigh_ifinfo_get(router, BATADV_IF_DEFAULT);
+ if (!router_ifinfo)
+ goto out;
+
+ curr_gw = batadv_gw_get_selected_gw_node(bat_priv);
+
+ hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,
+ NLM_F_MULTI, BATADV_CMD_GET_GATEWAYS);
+ if (!hdr) {
+ ret = -ENOBUFS;
+ goto out;
+ }
+
+ ret = -EMSGSIZE;
+
+ if (curr_gw == gw_node)
+ if (nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) {
+ genlmsg_cancel(msg, hdr);
+ goto out;
+ }
+
+ if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN,
+ gw_node->orig_node->orig) ||
+ nla_put_u8(msg, BATADV_ATTR_TQ, router_ifinfo->bat_iv.tq_avg) ||
+ nla_put(msg, BATADV_ATTR_ROUTER, ETH_ALEN,
+ router->addr) ||
+ nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
+ router->if_incoming->net_dev->name) ||
+ nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,
+ gw_node->bandwidth_down) ||
+ nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP,
+ gw_node->bandwidth_up)) {
+ genlmsg_cancel(msg, hdr);
+ goto out;
+ }
+
+ genlmsg_end(msg, hdr);
+ ret = 0;
+
+out:
+ if (router_ifinfo)
+ batadv_neigh_ifinfo_put(router_ifinfo);
+ if (router)
+ batadv_neigh_node_put(router);
+ return ret;
+}
+
+/**
+ * batadv_iv_gw_dump - Dump gateways into a message
+ * @msg: Netlink message to dump into
+ * @cb: Control block containing additional options
+ * @bat_priv: The bat priv with all the soft interface information
+ */
+static void batadv_iv_gw_dump(struct sk_buff *msg, struct netlink_callback *cb,
+ struct batadv_priv *bat_priv)
+{
+ int portid = NETLINK_CB(cb->skb).portid;
+ struct batadv_gw_node *gw_node;
+ int idx_skip = cb->args[0];
+ int idx = 0;
+
+ rcu_read_lock();
+ hlist_for_each_entry_rcu(gw_node, &bat_priv->gw.list, list) {
+ if (idx++ < idx_skip)
+ continue;
+
+ if (batadv_iv_gw_dump_entry(msg, portid, cb->nlh->nlmsg_seq,
+ bat_priv, gw_node)) {
+ idx_skip = idx - 1;
+ goto unlock;
+ }
+ }
+
+ idx_skip = idx;
+unlock:
+ rcu_read_unlock();
+
+ cb->args[0] = idx_skip;
+}
+
static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
.name = "BATMAN_IV",
.iface = {
@@ -2707,6 +2811,7 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = {
.get_best_gw_node = batadv_iv_gw_get_best_gw_node,
.is_eligible = batadv_iv_gw_is_eligible,
.print = batadv_iv_gw_print,
+ .dump = batadv_iv_gw_dump,
},
};
--
2.8.1
next prev parent reply other threads:[~2016-08-16 8:33 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-16 8:32 [PATCH 00/16] pull request for net-next: batman-adv 2016-08-16 Simon Wunderlich
2016-08-16 8:32 ` [PATCH 03/16] batman-adv: netlink: add routing_algo query Simon Wunderlich
[not found] ` <1471336364-16334-1-git-send-email-sw-2YrNx6rUIHYiY0qSoAWiAoQuADTiUCJX@public.gmane.org>
2016-08-16 8:32 ` [PATCH 01/16] batman-adv: Handle parent interfaces in a different netns Simon Wunderlich
2016-08-16 8:32 ` [PATCH 02/16] batman-adv: Suppress debugfs entries for netns's Simon Wunderlich
2016-08-16 8:32 ` [PATCH 04/16] batman-adv: netlink: hardif query Simon Wunderlich
2016-08-16 8:32 ` [PATCH 05/16] batman-adv: netlink: add translation table query Simon Wunderlich
2016-08-16 8:32 ` [PATCH 06/16] batman-adv: Provide TTVN in the mesh_info netlink msg Simon Wunderlich
2016-08-16 8:32 ` [PATCH 07/16] batman-adv: netlink: add originator and neighbor table queries Simon Wunderlich
2016-08-16 8:32 ` [PATCH 08/16] batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations Simon Wunderlich
2016-08-16 8:32 ` [PATCH 09/16] batman-adv: add B.A.T.M.A.N. V " Simon Wunderlich
2016-08-16 8:32 ` [PATCH 10/16] batman-adv: netlink: add gateway table queries Simon Wunderlich
2016-08-16 8:32 ` Simon Wunderlich [this message]
2016-08-16 8:32 ` [PATCH 12/16] batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations Simon Wunderlich
2016-08-16 8:32 ` [PATCH 13/16] batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink Simon Wunderlich
2016-08-16 8:32 ` [PATCH 14/16] batman-adv: Provide bla group in the mesh_info netlink msg Simon Wunderlich
2016-08-16 8:32 ` [PATCH 15/16] batman-adv: add backbone table netlink support Simon Wunderlich
2016-08-16 8:32 ` [PATCH 16/16] batman-adv: Indicate netlink socket can be used with netns Simon Wunderlich
2016-08-17 23:23 ` [PATCH 00/16] pull request for net-next: batman-adv 2016-08-16 David Miller
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=1471336364-16334-12-git-send-email-sw@simonwunderlich.de \
--to=sw@simonwunderlich.de \
--cc=andrew@lunn.ch \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
--cc=davem@davemloft.net \
--cc=mareklindner@neomailbox.ch \
--cc=netdev@vger.kernel.org \
--cc=sven.eckelmann@open-mesh.com \
/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).