Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00062a93 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'batadv-next-for-davem-20160816' of git://git.open-mesh.org/linux-merge 



Simon Wunderlich says:

====================
pull request for net-next: batman-adv 2016-08-16

This feature patchset is all about adding netlink support, which should
supersede our debugfs configuration interface in the long run. It is
especially necessary when batman-adv should be used in different
namespaces, since debugfs can not differentiate between those.

More specifically, the following changes are included:

 - Two fixes for namespace handling by Andrew Lunn, checking also the
   namespaces for parent interfaces, and supress debugfs entries
   for non-default netns

 - Implement various netlink commands for the new interface, by
   Matthias Schiffer, Andrew Lunn, Sven Eckelmann and Simon Wunderlich
   (13 patches):
    * routing algorithm list
    * hardif list
    * translation tables (local and global)
    * TTVN for the translation tables
    * originator and neighbor tables for B.A.T.M.A.N. IV
      and B.A.T.M.A.N. V
    * gateway dump functionality for B.A.T.M.A.N. IV
      and B.A.T.M.A.N. V
    * Bridge Loop Avoidance claims, and corresponding BLA group
    * Bridge Loop Avoidance backbone tables

 - Finally, mark batman-adv as netns compatible, by Andrew Lunn (1 patch)
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 268ef4b7 4c09a08b

include/uapi/linux/batman_adv.h

+94 −0
Original line number Diff line number Diff line
@@ -22,6 +22,42 @@ 


#define BATADV_NL_MCAST_GROUP_TPMETER	"tpmeter"



/**

 * enum batadv_tt_client_flags - TT client specific flags

 * @BATADV_TT_CLIENT_DEL: the client has to be deleted from the table

 * @BATADV_TT_CLIENT_ROAM: the client roamed to/from another node and the new

 *  update telling its new real location has not been received/sent yet

 * @BATADV_TT_CLIENT_WIFI: this client is connected through a wifi interface.

 *  This information is used by the "AP Isolation" feature

 * @BATADV_TT_CLIENT_ISOLA: this client is considered "isolated". This

 *  information is used by the Extended Isolation feature

 * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from the table

 * @BATADV_TT_CLIENT_NEW: this client has been added to the local table but has

 *  not been announced yet

 * @BATADV_TT_CLIENT_PENDING: this client is marked for removal but it is kept

 *  in the table for one more originator interval for consistency purposes

 * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be part of

 *  the network but no nnode has already announced it

 *

 * Bits from 0 to 7 are called _remote flags_ because they are sent on the wire.

 * Bits from 8 to 15 are called _local flags_ because they are used for local

 * computations only.

 *

 * Bits from 4 to 7 - a subset of remote flags - are ensured to be in sync with

 * the other nodes in the network. To achieve this goal these flags are included

 * in the TT CRC computation.

 */

enum batadv_tt_client_flags {

	BATADV_TT_CLIENT_DEL     = (1 << 0),

	BATADV_TT_CLIENT_ROAM    = (1 << 1),

	BATADV_TT_CLIENT_WIFI    = (1 << 4),

	BATADV_TT_CLIENT_ISOLA	 = (1 << 5),

	BATADV_TT_CLIENT_NOPURGE = (1 << 8),

	BATADV_TT_CLIENT_NEW     = (1 << 9),

	BATADV_TT_CLIENT_PENDING = (1 << 10),

	BATADV_TT_CLIENT_TEMP	 = (1 << 11),

};



/**

 * enum batadv_nl_attrs - batman-adv netlink attributes

 *
@@ -40,6 +76,26 @@ 
 * @BATADV_ATTR_TPMETER_BYTES: amount of acked bytes during run

 * @BATADV_ATTR_TPMETER_COOKIE: session cookie to match tp_meter session

 * @BATADV_ATTR_PAD: attribute used for padding for 64-bit alignment

 * @BATADV_ATTR_ACTIVE: Flag indicating if the hard interface is active

 * @BATADV_ATTR_TT_ADDRESS: Client MAC address

 * @BATADV_ATTR_TT_TTVN: Translation table version

 * @BATADV_ATTR_TT_LAST_TTVN: Previous translation table version

 * @BATADV_ATTR_TT_CRC32: CRC32 over translation table

 * @BATADV_ATTR_TT_VID: VLAN ID

 * @BATADV_ATTR_TT_FLAGS: Translation table client flags

 * @BATADV_ATTR_FLAG_BEST: Flags indicating entry is the best

 * @BATADV_ATTR_LAST_SEEN_MSECS: Time in milliseconds since last seen

 * @BATADV_ATTR_NEIGH_ADDRESS: Neighbour MAC address

 * @BATADV_ATTR_TQ: TQ to neighbour

 * @BATADV_ATTR_THROUGHPUT: Estimated throughput to Neighbour

 * @BATADV_ATTR_BANDWIDTH_UP: Reported uplink bandwidth

 * @BATADV_ATTR_BANDWIDTH_DOWN: Reported downlink bandwidth

 * @BATADV_ATTR_ROUTER: Gateway router MAC address

 * @BATADV_ATTR_BLA_OWN: Flag indicating own originator

 * @BATADV_ATTR_BLA_ADDRESS: Bridge loop avoidance claim MAC address

 * @BATADV_ATTR_BLA_VID: BLA VLAN ID

 * @BATADV_ATTR_BLA_BACKBONE: BLA gateway originator MAC address

 * @BATADV_ATTR_BLA_CRC: BLA CRC

 * @__BATADV_ATTR_AFTER_LAST: internal use

 * @NUM_BATADV_ATTR: total number of batadv_nl_attrs available

 * @BATADV_ATTR_MAX: highest attribute number currently defined
@@ -60,6 +116,26 @@ enum batadv_nl_attrs { 
	BATADV_ATTR_TPMETER_BYTES,

	BATADV_ATTR_TPMETER_COOKIE,

	BATADV_ATTR_PAD,

	BATADV_ATTR_ACTIVE,

	BATADV_ATTR_TT_ADDRESS,

	BATADV_ATTR_TT_TTVN,

	BATADV_ATTR_TT_LAST_TTVN,

	BATADV_ATTR_TT_CRC32,

	BATADV_ATTR_TT_VID,

	BATADV_ATTR_TT_FLAGS,

	BATADV_ATTR_FLAG_BEST,

	BATADV_ATTR_LAST_SEEN_MSECS,

	BATADV_ATTR_NEIGH_ADDRESS,

	BATADV_ATTR_TQ,

	BATADV_ATTR_THROUGHPUT,

	BATADV_ATTR_BANDWIDTH_UP,

	BATADV_ATTR_BANDWIDTH_DOWN,

	BATADV_ATTR_ROUTER,

	BATADV_ATTR_BLA_OWN,

	BATADV_ATTR_BLA_ADDRESS,

	BATADV_ATTR_BLA_VID,

	BATADV_ATTR_BLA_BACKBONE,

	BATADV_ATTR_BLA_CRC,

	/* add attributes above here, update the policy in netlink.c */

	__BATADV_ATTR_AFTER_LAST,

	NUM_BATADV_ATTR = __BATADV_ATTR_AFTER_LAST,
@@ -73,6 +149,15 @@ enum batadv_nl_attrs { 
 * @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv device

 * @BATADV_CMD_TP_METER: Start a tp meter session

 * @BATADV_CMD_TP_METER_CANCEL: Cancel a tp meter session

 * @BATADV_CMD_GET_ROUTING_ALGOS: Query the list of routing algorithms.

 * @BATADV_CMD_GET_HARDIFS: Query list of hard interfaces

 * @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations

 * @BATADV_CMD_GET_TRANSTABLE_GLOBAL Query list of global translations

 * @BATADV_CMD_GET_ORIGINATORS: Query list of originators

 * @BATADV_CMD_GET_NEIGHBORS: Query list of neighbours

 * @BATADV_CMD_GET_GATEWAYS: Query list of gateways

 * @BATADV_CMD_GET_BLA_CLAIM: Query list of bridge loop avoidance claims

 * @BATADV_CMD_GET_BLA_BACKBONE: Query list of bridge loop avoidance backbones

 * @__BATADV_CMD_AFTER_LAST: internal use

 * @BATADV_CMD_MAX: highest used command number

 */
@@ -81,6 +166,15 @@ enum batadv_nl_commands { 
	BATADV_CMD_GET_MESH_INFO,

	BATADV_CMD_TP_METER,

	BATADV_CMD_TP_METER_CANCEL,

	BATADV_CMD_GET_ROUTING_ALGOS,

	BATADV_CMD_GET_HARDIFS,

	BATADV_CMD_GET_TRANSTABLE_LOCAL,

	BATADV_CMD_GET_TRANSTABLE_GLOBAL,

	BATADV_CMD_GET_ORIGINATORS,

	BATADV_CMD_GET_NEIGHBORS,

	BATADV_CMD_GET_GATEWAYS,

	BATADV_CMD_GET_BLA_CLAIM,

	BATADV_CMD_GET_BLA_BACKBONE,

	/* add new commands above here */

	__BATADV_CMD_AFTER_LAST,

	BATADV_CMD_MAX = __BATADV_CMD_AFTER_LAST - 1

net/batman-adv/bat_algo.c

+68 −0
Original line number Diff line number Diff line
@@ -20,12 +20,18 @@ 
#include <linux/errno.h>

#include <linux/list.h>

#include <linux/moduleparam.h>

#include <linux/netlink.h>

#include <linux/printk.h>

#include <linux/seq_file.h>

#include <linux/skbuff.h>

#include <linux/stddef.h>

#include <linux/string.h>

#include <net/genetlink.h>

#include <net/netlink.h>

#include <uapi/linux/batman_adv.h>



#include "bat_algo.h"

#include "netlink.h"



char batadv_routing_algo[20] = "BATMAN_IV";

static struct hlist_head batadv_algo_list;
@@ -138,3 +144,65 @@ static struct kparam_string batadv_param_string_ra = { 


module_param_cb(routing_algo, &batadv_param_ops_ra, &batadv_param_string_ra,

		0644);



/**

 * batadv_algo_dump_entry - fill in information about one supported routing

 *  algorithm

 * @msg: netlink message to be sent back

 * @portid: Port to reply to

 * @seq: Sequence number of message

 * @bat_algo_ops: Algorithm to be dumped

 *

 * Return: Error number, or 0 on success

 */

static int batadv_algo_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

				  struct batadv_algo_ops *bat_algo_ops)

{

	void *hdr;



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_ROUTING_ALGOS);

	if (!hdr)

		return -EMSGSIZE;



	if (nla_put_string(msg, BATADV_ATTR_ALGO_NAME, bat_algo_ops->name))

		goto nla_put_failure;



	genlmsg_end(msg, hdr);

	return 0;



 nla_put_failure:

	genlmsg_cancel(msg, hdr);

	return -EMSGSIZE;

}



/**

 * batadv_algo_dump - fill in information about supported routing

 *  algorithms

 * @msg: netlink message to be sent back

 * @cb: Parameters to the netlink request

 *

 * Return: Length of reply message.

 */

int batadv_algo_dump(struct sk_buff *msg, struct netlink_callback *cb)

{

	int portid = NETLINK_CB(cb->skb).portid;

	struct batadv_algo_ops *bat_algo_ops;

	int skip = cb->args[0];

	int i = 0;



	hlist_for_each_entry(bat_algo_ops, &batadv_algo_list, list) {

		if (i++ < skip)

			continue;



		if (batadv_algo_dump_entry(msg, portid, cb->nlh->nlmsg_seq,

					   bat_algo_ops)) {

			i--;

			break;

		}

	}



	cb->args[0] = i;



	return msg->len;

}

net/batman-adv/bat_algo.h

+3 −0
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ 


#include <linux/types.h>



struct netlink_callback;

struct seq_file;

struct sk_buff;



extern char batadv_routing_algo[];

extern struct list_head batadv_hardif_list;
@@ -31,5 +33,6 @@ void batadv_algo_init(void); 
int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);

int batadv_algo_select(struct batadv_priv *bat_priv, char *name);

int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);

int batadv_algo_dump(struct sk_buff *msg, struct netlink_callback *cb);



#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */

net/batman-adv/bat_iv_ogm.c

+471 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/netdevice.h>

#include <linux/netlink.h>

#include <linux/pkt_sched.h>

#include <linux/printk.h>

#include <linux/random.h>
@@ -48,6 +49,9 @@ 
#include <linux/string.h>

#include <linux/types.h>

#include <linux/workqueue.h>

#include <net/genetlink.h>

#include <net/netlink.h>

#include <uapi/linux/batman_adv.h>



#include "bat_algo.h"

#include "bitarray.h"
@@ -55,6 +59,7 @@ 
#include "hard-interface.h"

#include "hash.h"

#include "log.h"

#include "netlink.h"

#include "network-coding.h"

#include "originator.h"

#include "packet.h"
@@ -1947,6 +1952,235 @@ static void batadv_iv_ogm_orig_print(struct batadv_priv *bat_priv, 
		seq_puts(seq, "No batman nodes in range ...\n");

}



/**

 * batadv_iv_ogm_neigh_get_tq_avg - Get the TQ average for a neighbour on a

 *  given outgoing interface.

 * @neigh_node: Neighbour of interest

 * @if_outgoing: Outgoing interface of interest

 * @tq_avg: Pointer of where to store the TQ average

 *

 * Return: False if no average TQ available, otherwise true.

 */

static bool

batadv_iv_ogm_neigh_get_tq_avg(struct batadv_neigh_node *neigh_node,

			       struct batadv_hard_iface *if_outgoing,

			       u8 *tq_avg)

{

	struct batadv_neigh_ifinfo *n_ifinfo;



	n_ifinfo = batadv_neigh_ifinfo_get(neigh_node, if_outgoing);

	if (!n_ifinfo)

		return false;



	*tq_avg = n_ifinfo->bat_iv.tq_avg;

	batadv_neigh_ifinfo_put(n_ifinfo);



	return true;

}



/**

 * batadv_iv_ogm_orig_dump_subentry - Dump an originator subentry 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

 * @if_outgoing: Limit dump to entries with this outgoing interface

 * @orig_node: Originator to dump

 * @neigh_node: Single hops neighbour

 * @best: Is the best originator

 *

 * Return: Error code, or 0 on success

 */

static int

batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,

				 struct batadv_priv *bat_priv,

				 struct batadv_hard_iface *if_outgoing,

				 struct batadv_orig_node *orig_node,

				 struct batadv_neigh_node *neigh_node,

				 bool best)

{

	void *hdr;

	u8 tq_avg;

	unsigned int last_seen_msecs;



	last_seen_msecs = jiffies_to_msecs(jiffies - orig_node->last_seen);



	if (!batadv_iv_ogm_neigh_get_tq_avg(neigh_node, if_outgoing, &tq_avg))

		return 0;



	if (if_outgoing != BATADV_IF_DEFAULT &&

	    if_outgoing != neigh_node->if_incoming)

		return 0;



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_ORIGINATORS);

	if (!hdr)

		return -ENOBUFS;



	if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN,

		    orig_node->orig) ||

	    nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    neigh_node->addr) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			neigh_node->if_incoming->net_dev->ifindex) ||

	    nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) ||

	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,

			last_seen_msecs))

		goto nla_put_failure;



	if (best && nla_put_flag(msg, BATADV_ATTR_FLAG_BEST))

		goto nla_put_failure;



	genlmsg_end(msg, hdr);

	return 0;



 nla_put_failure:

	genlmsg_cancel(msg, hdr);

	return -EMSGSIZE;

}



/**

 * batadv_iv_ogm_orig_dump_entry - Dump an originator entry 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

 * @if_outgoing: Limit dump to entries with this outgoing interface

 * @orig_node: Originator to dump

 * @sub_s: Number of sub entries to skip

 *

 * This function assumes the caller holds rcu_read_lock().

 *

 * Return: Error code, or 0 on success

 */

static int

batadv_iv_ogm_orig_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,

			      struct batadv_priv *bat_priv,

			      struct batadv_hard_iface *if_outgoing,

			      struct batadv_orig_node *orig_node, int *sub_s)

{

	struct batadv_neigh_node *neigh_node_best;

	struct batadv_neigh_node *neigh_node;

	int sub = 0;

	bool best;

	u8 tq_avg_best;



	neigh_node_best = batadv_orig_router_get(orig_node, if_outgoing);

	if (!neigh_node_best)

		goto out;



	if (!batadv_iv_ogm_neigh_get_tq_avg(neigh_node_best, if_outgoing,

					    &tq_avg_best))

		goto out;



	if (tq_avg_best == 0)

		goto out;



	hlist_for_each_entry_rcu(neigh_node, &orig_node->neigh_list, list) {

		if (sub++ < *sub_s)

			continue;



		best = (neigh_node == neigh_node_best);



		if (batadv_iv_ogm_orig_dump_subentry(msg, portid, seq,

						     bat_priv, if_outgoing,

						     orig_node, neigh_node,

						     best)) {

			batadv_neigh_node_put(neigh_node_best);



			*sub_s = sub - 1;

			return -EMSGSIZE;

		}

	}



 out:

	if (neigh_node_best)

		batadv_neigh_node_put(neigh_node_best);



	*sub_s = 0;

	return 0;

}



/**

 * batadv_iv_ogm_orig_dump_bucket - Dump an originator bucket 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

 * @if_outgoing: Limit dump to entries with this outgoing interface

 * @head: Bucket to be dumped

 * @idx_s: Number of entries to be skipped

 * @sub: Number of sub entries to be skipped

 *

 * Return: Error code, or 0 on success

 */

static int

batadv_iv_ogm_orig_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,

			       struct batadv_priv *bat_priv,

			       struct batadv_hard_iface *if_outgoing,

			       struct hlist_head *head, int *idx_s, int *sub)

{

	struct batadv_orig_node *orig_node;

	int idx = 0;



	rcu_read_lock();

	hlist_for_each_entry_rcu(orig_node, head, hash_entry) {

		if (idx++ < *idx_s)

			continue;



		if (batadv_iv_ogm_orig_dump_entry(msg, portid, seq, bat_priv,

						  if_outgoing, orig_node,

						  sub)) {

			rcu_read_unlock();

			*idx_s = idx - 1;

			return -EMSGSIZE;

		}

	}

	rcu_read_unlock();



	*idx_s = 0;

	*sub = 0;

	return 0;

}



/**

 * batadv_iv_ogm_orig_dump - Dump the originators 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

 * @if_outgoing: Limit dump to entries with this outgoing interface

 */

static void

batadv_iv_ogm_orig_dump(struct sk_buff *msg, struct netlink_callback *cb,

			struct batadv_priv *bat_priv,

			struct batadv_hard_iface *if_outgoing)

{

	struct batadv_hashtable *hash = bat_priv->orig_hash;

	struct hlist_head *head;

	int bucket = cb->args[0];

	int idx = cb->args[1];

	int sub = cb->args[2];

	int portid = NETLINK_CB(cb->skb).portid;



	while (bucket < hash->size) {

		head = &hash->table[bucket];



		if (batadv_iv_ogm_orig_dump_bucket(msg, portid,

						   cb->nlh->nlmsg_seq,

						   bat_priv, if_outgoing, head,

						   &idx, &sub))

			break;



		bucket++;

	}



	cb->args[0] = bucket;

	cb->args[1] = idx;

	cb->args[2] = sub;

}



/**

 * batadv_iv_hardif_neigh_print - print a single hop neighbour node

 * @seq: neighbour table seq_file struct
@@ -2043,6 +2277,136 @@ static bool batadv_iv_ogm_neigh_diff(struct batadv_neigh_node *neigh1, 
	return ret;

}



/**

 * batadv_iv_ogm_neigh_dump_neigh - Dump a neighbour into a netlink message

 * @msg: Netlink message to dump into

 * @portid: Port making netlink request

 * @seq: Sequence number of netlink message

 * @hardif_neigh: Neighbour to be dumped

 *

 * Return: Error code, or 0 on success

 */

static int

batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq,

			       struct batadv_hardif_neigh_node *hardif_neigh)

{

	void *hdr;

	unsigned int last_seen_msecs;



	last_seen_msecs = jiffies_to_msecs(jiffies - hardif_neigh->last_seen);



	hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,

			  NLM_F_MULTI, BATADV_CMD_GET_NEIGHBORS);

	if (!hdr)

		return -ENOBUFS;



	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    hardif_neigh->addr) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			hardif_neigh->if_incoming->net_dev->ifindex) ||

	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,

			last_seen_msecs))

		goto nla_put_failure;



	genlmsg_end(msg, hdr);

	return 0;



 nla_put_failure:

	genlmsg_cancel(msg, hdr);

	return -EMSGSIZE;

}



/**

 * batadv_iv_ogm_neigh_dump_hardif - Dump the neighbours of a hard interface

 *  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

 * @hard_iface: Hard interface to dump the neighbours for

 * @idx_s: Number of entries to skip

 *

 * This function assumes the caller holds rcu_read_lock().

 *

 * Return: Error code, or 0 on success

 */

static int

batadv_iv_ogm_neigh_dump_hardif(struct sk_buff *msg, u32 portid, u32 seq,

				struct batadv_priv *bat_priv,

				struct batadv_hard_iface *hard_iface,

				int *idx_s)

{

	struct batadv_hardif_neigh_node *hardif_neigh;

	int idx = 0;



	hlist_for_each_entry_rcu(hardif_neigh,

				 &hard_iface->neigh_list, list) {

		if (idx++ < *idx_s)

			continue;



		if (batadv_iv_ogm_neigh_dump_neigh(msg, portid, seq,

						   hardif_neigh)) {

			*idx_s = idx - 1;

			return -EMSGSIZE;

		}

	}



	*idx_s = 0;

	return 0;

}



/**

 * batadv_iv_ogm_neigh_dump - Dump the neighbours 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

 * @single_hardif: Limit dump to this hard interfaace

 */

static void

batadv_iv_ogm_neigh_dump(struct sk_buff *msg, struct netlink_callback *cb,

			 struct batadv_priv *bat_priv,

			 struct batadv_hard_iface *single_hardif)

{

	struct batadv_hard_iface *hard_iface;

	int i_hardif = 0;

	int i_hardif_s = cb->args[0];

	int idx = cb->args[1];

	int portid = NETLINK_CB(cb->skb).portid;



	rcu_read_lock();

	if (single_hardif) {

		if (i_hardif_s == 0) {

			if (batadv_iv_ogm_neigh_dump_hardif(msg, portid,

							    cb->nlh->nlmsg_seq,

							    bat_priv,

							    single_hardif,

							    &idx) == 0)

				i_hardif++;

		}

	} else {

		list_for_each_entry_rcu(hard_iface, &batadv_hardif_list,

					list) {

			if (hard_iface->soft_iface != bat_priv->soft_iface)

				continue;



			if (i_hardif++ < i_hardif_s)

				continue;



			if (batadv_iv_ogm_neigh_dump_hardif(msg, portid,

							    cb->nlh->nlmsg_seq,

							    bat_priv,

							    hard_iface, &idx)) {

				i_hardif--;

				break;

			}

		}

	}

	rcu_read_unlock();



	cb->args[0] = i_hardif;

	cb->args[1] = idx;

}



/**

 * batadv_iv_ogm_neigh_cmp - compare the metrics of two neighbors

 * @neigh1: the first neighbor object of the comparison
@@ -2317,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 = {
@@ -2330,9 +2798,11 @@ static struct batadv_algo_ops batadv_batman_iv __read_mostly = { 
		.cmp = batadv_iv_ogm_neigh_cmp,

		.is_similar_or_better = batadv_iv_ogm_neigh_is_sob,

		.print = batadv_iv_neigh_print,

		.dump = batadv_iv_ogm_neigh_dump,

	},

	.orig = {

		.print = batadv_iv_ogm_orig_print,

		.dump = batadv_iv_ogm_orig_dump,

		.free = batadv_iv_ogm_orig_free,

		.add_if = batadv_iv_ogm_orig_add_if,

		.del_if = batadv_iv_ogm_orig_del_if,
@@ -2341,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,

	},

};

net/batman-adv/bat_v.c

+465 −0

File changed.

Preview size limit exceeded, changes collapsed.