batman-adv: netlink: add translation table query
This adds the commands BATADV_CMD_GET_TRANSTABLE_LOCAL and BATADV_CMD_GET_TRANSTABLE_GLOBAL, which correspond to the transtable_local and transtable_global debugfs files. The batadv_tt_client_flags enum is moved to the UAPI to expose it as part of the netlink API. Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net> Signed-off-by: Andrew Lunn <andrew@lunn.ch> [sven.eckelmann@open-mesh.com: add policy for attributes, fix includes] Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com> [sw@simonwunderlich.de: fix VID attributes content] Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de> Signed-off-by: Marek Lindner <mareklindner@neomailbox.ch>
Šī revīzija ir iekļauta:

revīziju iesūtīja
Simon Wunderlich

vecāks
b60620cf56
revīzija
d34f05507d
@@ -37,20 +37,27 @@
|
||||
#include <linux/list.h>
|
||||
#include <linux/lockdep.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/rcupdate.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/skbuff.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/spinlock.h>
|
||||
#include <linux/stddef.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <net/genetlink.h>
|
||||
#include <net/netlink.h>
|
||||
#include <net/sock.h>
|
||||
#include <uapi/linux/batman_adv.h>
|
||||
|
||||
#include "bridge_loop_avoidance.h"
|
||||
#include "hard-interface.h"
|
||||
#include "hash.h"
|
||||
#include "log.h"
|
||||
#include "multicast.h"
|
||||
#include "netlink.h"
|
||||
#include "originator.h"
|
||||
#include "packet.h"
|
||||
#include "soft-interface.h"
|
||||
@@ -1108,6 +1115,164 @@ out:
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_tt_local_dump_entry - Dump one TT local 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
|
||||
* @common: tt local & tt global common data
|
||||
*
|
||||
* Return: Error code, or 0 on success
|
||||
*/
|
||||
static int
|
||||
batadv_tt_local_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_priv *bat_priv,
|
||||
struct batadv_tt_common_entry *common)
|
||||
{
|
||||
void *hdr;
|
||||
struct batadv_softif_vlan *vlan;
|
||||
struct batadv_tt_local_entry *local;
|
||||
unsigned int last_seen_msecs;
|
||||
u32 crc;
|
||||
|
||||
local = container_of(common, struct batadv_tt_local_entry, common);
|
||||
last_seen_msecs = jiffies_to_msecs(jiffies - local->last_seen);
|
||||
|
||||
vlan = batadv_softif_vlan_get(bat_priv, common->vid);
|
||||
if (!vlan)
|
||||
return 0;
|
||||
|
||||
crc = vlan->tt.crc;
|
||||
|
||||
batadv_softif_vlan_put(vlan);
|
||||
|
||||
hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,
|
||||
NLM_F_MULTI,
|
||||
BATADV_CMD_GET_TRANSTABLE_LOCAL);
|
||||
if (!hdr)
|
||||
return -ENOBUFS;
|
||||
|
||||
if (nla_put(msg, BATADV_ATTR_TT_ADDRESS, ETH_ALEN, common->addr) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_TT_CRC32, crc) ||
|
||||
nla_put_u16(msg, BATADV_ATTR_TT_VID, common->vid) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_TT_FLAGS, common->flags))
|
||||
goto nla_put_failure;
|
||||
|
||||
if (!(common->flags & BATADV_TT_CLIENT_NOPURGE) &&
|
||||
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_tt_local_dump_bucket - Dump one TT local 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
|
||||
* @head: Pointer to the list containing the local tt entries
|
||||
* @idx_s: Number of entries to skip
|
||||
*
|
||||
* Return: Error code, or 0 on success
|
||||
*/
|
||||
static int
|
||||
batadv_tt_local_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_priv *bat_priv,
|
||||
struct hlist_head *head, int *idx_s)
|
||||
{
|
||||
struct batadv_tt_common_entry *common;
|
||||
int idx = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(common, head, hash_entry) {
|
||||
if (idx++ < *idx_s)
|
||||
continue;
|
||||
|
||||
if (batadv_tt_local_dump_entry(msg, portid, seq, bat_priv,
|
||||
common)) {
|
||||
rcu_read_unlock();
|
||||
*idx_s = idx - 1;
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
*idx_s = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_tt_local_dump - Dump TT local entries into a message
|
||||
* @msg: Netlink message to dump into
|
||||
* @cb: Parameters from query
|
||||
*
|
||||
* Return: Error code, or 0 on success
|
||||
*/
|
||||
int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
||||
{
|
||||
struct net *net = sock_net(cb->skb->sk);
|
||||
struct net_device *soft_iface;
|
||||
struct batadv_priv *bat_priv;
|
||||
struct batadv_hard_iface *primary_if = NULL;
|
||||
struct batadv_hashtable *hash;
|
||||
struct hlist_head *head;
|
||||
int ret;
|
||||
int ifindex;
|
||||
int bucket = cb->args[0];
|
||||
int idx = cb->args[1];
|
||||
int portid = NETLINK_CB(cb->skb).portid;
|
||||
|
||||
ifindex = batadv_netlink_get_ifindex(cb->nlh, BATADV_ATTR_MESH_IFINDEX);
|
||||
if (!ifindex)
|
||||
return -EINVAL;
|
||||
|
||||
soft_iface = dev_get_by_index(net, ifindex);
|
||||
if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
bat_priv = netdev_priv(soft_iface);
|
||||
|
||||
primary_if = batadv_primary_if_get_selected(bat_priv);
|
||||
if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) {
|
||||
ret = -ENOENT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
hash = bat_priv->tt.local_hash;
|
||||
|
||||
while (bucket < hash->size) {
|
||||
head = &hash->table[bucket];
|
||||
|
||||
if (batadv_tt_local_dump_bucket(msg, portid, cb->nlh->nlmsg_seq,
|
||||
bat_priv, head, &idx))
|
||||
break;
|
||||
|
||||
bucket++;
|
||||
}
|
||||
|
||||
ret = msg->len;
|
||||
|
||||
out:
|
||||
if (primary_if)
|
||||
batadv_hardif_put(primary_if);
|
||||
if (soft_iface)
|
||||
dev_put(soft_iface);
|
||||
|
||||
cb->args[0] = bucket;
|
||||
cb->args[1] = idx;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
batadv_tt_local_set_pending(struct batadv_priv *bat_priv,
|
||||
struct batadv_tt_local_entry *tt_local_entry,
|
||||
@@ -1755,6 +1920,218 @@ out:
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_tt_global_dump_subentry - Dump all TT local entries into a message
|
||||
* @msg: Netlink message to dump into
|
||||
* @portid: Port making netlink request
|
||||
* @seq: Sequence number of netlink message
|
||||
* @common: tt local & tt global common data
|
||||
* @orig: Originator node announcing a non-mesh client
|
||||
* @best: Is the best originator for the TT entry
|
||||
*
|
||||
* Return: Error code, or 0 on success
|
||||
*/
|
||||
static int
|
||||
batadv_tt_global_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_tt_common_entry *common,
|
||||
struct batadv_tt_orig_list_entry *orig,
|
||||
bool best)
|
||||
{
|
||||
void *hdr;
|
||||
struct batadv_orig_node_vlan *vlan;
|
||||
u8 last_ttvn;
|
||||
u32 crc;
|
||||
|
||||
vlan = batadv_orig_node_vlan_get(orig->orig_node,
|
||||
common->vid);
|
||||
if (!vlan)
|
||||
return 0;
|
||||
|
||||
crc = vlan->tt.crc;
|
||||
|
||||
batadv_orig_node_vlan_put(vlan);
|
||||
|
||||
hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,
|
||||
NLM_F_MULTI,
|
||||
BATADV_CMD_GET_TRANSTABLE_GLOBAL);
|
||||
if (!hdr)
|
||||
return -ENOBUFS;
|
||||
|
||||
last_ttvn = atomic_read(&orig->orig_node->last_ttvn);
|
||||
|
||||
if (nla_put(msg, BATADV_ATTR_TT_ADDRESS, ETH_ALEN, common->addr) ||
|
||||
nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN,
|
||||
orig->orig_node->orig) ||
|
||||
nla_put_u8(msg, BATADV_ATTR_TT_TTVN, orig->ttvn) ||
|
||||
nla_put_u8(msg, BATADV_ATTR_TT_LAST_TTVN, last_ttvn) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_TT_CRC32, crc) ||
|
||||
nla_put_u16(msg, BATADV_ATTR_TT_VID, common->vid) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_TT_FLAGS, common->flags))
|
||||
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_tt_global_dump_entry - Dump one TT global 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
|
||||
* @common: tt local & tt global common data
|
||||
* @sub_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_tt_global_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_priv *bat_priv,
|
||||
struct batadv_tt_common_entry *common, int *sub_s)
|
||||
{
|
||||
struct batadv_tt_orig_list_entry *orig_entry, *best_entry;
|
||||
struct batadv_tt_global_entry *global;
|
||||
struct hlist_head *head;
|
||||
int sub = 0;
|
||||
bool best;
|
||||
|
||||
global = container_of(common, struct batadv_tt_global_entry, common);
|
||||
best_entry = batadv_transtable_best_orig(bat_priv, global);
|
||||
head = &global->orig_list;
|
||||
|
||||
hlist_for_each_entry_rcu(orig_entry, head, list) {
|
||||
if (sub++ < *sub_s)
|
||||
continue;
|
||||
|
||||
best = (orig_entry == best_entry);
|
||||
|
||||
if (batadv_tt_global_dump_subentry(msg, portid, seq, common,
|
||||
orig_entry, best)) {
|
||||
*sub_s = sub - 1;
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
}
|
||||
|
||||
*sub_s = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_tt_global_dump_bucket - Dump one TT local 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
|
||||
* @head: Pointer to the list containing the global tt entries
|
||||
* @idx_s: Number of entries to skip
|
||||
* @sub: Number of entries to skip
|
||||
*
|
||||
* Return: Error code, or 0 on success
|
||||
*/
|
||||
static int
|
||||
batadv_tt_global_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_priv *bat_priv,
|
||||
struct hlist_head *head, int *idx_s, int *sub)
|
||||
{
|
||||
struct batadv_tt_common_entry *common;
|
||||
int idx = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(common, head, hash_entry) {
|
||||
if (idx++ < *idx_s)
|
||||
continue;
|
||||
|
||||
if (batadv_tt_global_dump_entry(msg, portid, seq, bat_priv,
|
||||
common, sub)) {
|
||||
rcu_read_unlock();
|
||||
*idx_s = idx - 1;
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
*idx_s = 0;
|
||||
*sub = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_tt_global_dump - Dump TT global entries into a message
|
||||
* @msg: Netlink message to dump into
|
||||
* @cb: Parameters from query
|
||||
*
|
||||
* Return: Error code, or length of message on success
|
||||
*/
|
||||
int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
||||
{
|
||||
struct net *net = sock_net(cb->skb->sk);
|
||||
struct net_device *soft_iface;
|
||||
struct batadv_priv *bat_priv;
|
||||
struct batadv_hard_iface *primary_if = NULL;
|
||||
struct batadv_hashtable *hash;
|
||||
struct hlist_head *head;
|
||||
int ret;
|
||||
int ifindex;
|
||||
int bucket = cb->args[0];
|
||||
int idx = cb->args[1];
|
||||
int sub = cb->args[2];
|
||||
int portid = NETLINK_CB(cb->skb).portid;
|
||||
|
||||
ifindex = batadv_netlink_get_ifindex(cb->nlh, BATADV_ATTR_MESH_IFINDEX);
|
||||
if (!ifindex)
|
||||
return -EINVAL;
|
||||
|
||||
soft_iface = dev_get_by_index(net, ifindex);
|
||||
if (!soft_iface || !batadv_softif_is_valid(soft_iface)) {
|
||||
ret = -ENODEV;
|
||||
goto out;
|
||||
}
|
||||
|
||||
bat_priv = netdev_priv(soft_iface);
|
||||
|
||||
primary_if = batadv_primary_if_get_selected(bat_priv);
|
||||
if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) {
|
||||
ret = -ENOENT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
hash = bat_priv->tt.global_hash;
|
||||
|
||||
while (bucket < hash->size) {
|
||||
head = &hash->table[bucket];
|
||||
|
||||
if (batadv_tt_global_dump_bucket(msg, portid,
|
||||
cb->nlh->nlmsg_seq, bat_priv,
|
||||
head, &idx, &sub))
|
||||
break;
|
||||
|
||||
bucket++;
|
||||
}
|
||||
|
||||
ret = msg->len;
|
||||
|
||||
out:
|
||||
if (primary_if)
|
||||
batadv_hardif_put(primary_if);
|
||||
if (soft_iface)
|
||||
dev_put(soft_iface);
|
||||
|
||||
cb->args[0] = bucket;
|
||||
cb->args[1] = idx;
|
||||
cb->args[2] = sub;
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* _batadv_tt_global_del_orig_entry - remove and free an orig_entry
|
||||
* @tt_global_entry: the global entry to remove the orig_entry from
|
||||
|
Atsaukties uz šo jaunā problēmā
Block a user