This feature/cleanup patchset includes the following patches:
- avoid redundant multicast TT entries, by Linus Luessing - add netlink support for distributed arp table cache and multicast flags, by Linus Luessing (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlqv59kWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoSBaD/9r/oJC+Q/3Eu6DTAAiS7Jx2IpQ kOwU7l4hkGK8mBZ098CkmHTBY+zurqYwcokCHhKJO5mqJEpvlM27PuQxzqWSBMMO FWFax2YlKPpJp+/f/rSD9HS73RTY7npv6l5/eFg6+0WSQET04PjLB1KxPrO5u1+Z JujrAxp0GEyMoVQgMy9uloedkpizhADyYSZzDDXnHhq1NiAPU87cjrTLv/xdtdp7 TvbNfobhZUmKZ951yaRlDmE+mH8IoTQoY7HD/JANnduYeFJAlIPnHQEQa8+5tLwO qWUeLa4Acv5MhO2KjbKQpu5r2dFbs0x+jmsja8xBmgNWO5meKh/aE8TKGJeDVQEW TTynEivf82suiquCIZ573fBnliJkipffg32ZHgtNGrh54hh+YU7Sts0t9Lsou4ar aOU6lup3MHFysf3s9hK6y9TzSqwFJ8Mak0UFsa03r0Ub8am6bKHTqMFaCgN0aK9P vBL4atSvJVguwPlzxLMi44K4NxqEVfa41dZ7nQ99P3BFzWwSvph3i4lu+cxGxwI7 4kgWU5Cz8T51dH7g8j3vUish36DzwQtUsKLWZVpV+DV4BaHJ/rLyqeug3ffUrWRk p0bFU7wBAv8rKeFPd30m2tdJ/nMo+rDbN6Tm9n43tK4NWKOGBndhCoNhjfrzhM8U un6Iy7taISgeElZ5fQ== =HVxO -----END PGP SIGNATURE----- Merge tag 'batadv-next-for-davem-20180319' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== This feature/cleanup patchset includes the following patches: - avoid redundant multicast TT entries, by Linus Luessing - add netlink support for distributed arp table cache and multicast flags, by Linus Luessing (2 patches) ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
commit
755f6633d6
|
@ -91,6 +91,53 @@ enum batadv_tt_client_flags {
|
|||
BATADV_TT_CLIENT_TEMP = (1 << 11),
|
||||
};
|
||||
|
||||
/**
|
||||
* enum batadv_mcast_flags_priv - Private, own multicast flags
|
||||
*
|
||||
* These are internal, multicast related flags. Currently they describe certain
|
||||
* multicast related attributes of the segment this originator bridges into the
|
||||
* mesh.
|
||||
*
|
||||
* Those attributes are used to determine the public multicast flags this
|
||||
* originator is going to announce via TT.
|
||||
*
|
||||
* For netlink, if BATADV_MCAST_FLAGS_BRIDGED is unset then all querier
|
||||
* related flags are undefined.
|
||||
*/
|
||||
enum batadv_mcast_flags_priv {
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_BRIDGED: There is a bridge on top of the mesh
|
||||
* interface.
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_BRIDGED = (1 << 0),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS: Whether an IGMP querier
|
||||
* exists in the mesh
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS = (1 << 1),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS: Whether an MLD querier
|
||||
* exists in the mesh
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS = (1 << 2),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING: If an IGMP querier
|
||||
* exists, whether it is potentially shadowing multicast listeners
|
||||
* (i.e. querier is behind our own bridge segment)
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING = (1 << 3),
|
||||
|
||||
/**
|
||||
* @BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING: If an MLD querier
|
||||
* exists, whether it is potentially shadowing multicast listeners
|
||||
* (i.e. querier is behind our own bridge segment)
|
||||
*/
|
||||
BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING = (1 << 4),
|
||||
};
|
||||
|
||||
/**
|
||||
* enum batadv_nl_attrs - batman-adv netlink attributes
|
||||
*/
|
||||
|
@ -272,6 +319,31 @@ enum batadv_nl_attrs {
|
|||
*/
|
||||
BATADV_ATTR_BLA_CRC,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_IP4ADDRESS: Client IPv4 address
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_IP4ADDRESS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_HWADDRESS: Client MAC address
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_HWADDRESS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_DAT_CACHE_VID: VLAN ID
|
||||
*/
|
||||
BATADV_ATTR_DAT_CACHE_VID,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_MCAST_FLAGS: Per originator multicast flags
|
||||
*/
|
||||
BATADV_ATTR_MCAST_FLAGS,
|
||||
|
||||
/**
|
||||
* @BATADV_ATTR_MCAST_FLAGS_PRIV: Private, own multicast flags
|
||||
*/
|
||||
BATADV_ATTR_MCAST_FLAGS_PRIV,
|
||||
|
||||
/* add attributes above here, update the policy in netlink.c */
|
||||
|
||||
/**
|
||||
|
@ -361,6 +433,16 @@ enum batadv_nl_commands {
|
|||
*/
|
||||
BATADV_CMD_GET_BLA_BACKBONE,
|
||||
|
||||
/**
|
||||
* @BATADV_CMD_GET_DAT_CACHE: Query list of DAT cache entries
|
||||
*/
|
||||
BATADV_CMD_GET_DAT_CACHE,
|
||||
|
||||
/**
|
||||
* @BATADV_CMD_GET_MCAST_FLAGS: Query list of multicast flags
|
||||
*/
|
||||
BATADV_CMD_GET_MCAST_FLAGS,
|
||||
|
||||
/* add new commands above here */
|
||||
|
||||
/**
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <linux/kernel.h>
|
||||
#include <linux/kref.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/rcupdate.h>
|
||||
#include <linux/seq_file.h>
|
||||
|
@ -43,13 +44,19 @@
|
|||
#include <linux/string.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <net/arp.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 "netlink.h"
|
||||
#include "originator.h"
|
||||
#include "send.h"
|
||||
#include "soft-interface.h"
|
||||
#include "translation-table.h"
|
||||
#include "tvlv.h"
|
||||
|
||||
|
@ -851,6 +858,151 @@ out:
|
|||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* batadv_dat_cache_dump_entry() - dump one entry of the DAT cache table to a
|
||||
* netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @portid: netlink port
|
||||
* @seq: Sequence number of netlink message
|
||||
* @dat_entry: entry to dump
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
batadv_dat_cache_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_dat_entry *dat_entry)
|
||||
{
|
||||
int msecs;
|
||||
void *hdr;
|
||||
|
||||
hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,
|
||||
NLM_F_MULTI, BATADV_CMD_GET_DAT_CACHE);
|
||||
if (!hdr)
|
||||
return -ENOBUFS;
|
||||
|
||||
msecs = jiffies_to_msecs(jiffies - dat_entry->last_update);
|
||||
|
||||
if (nla_put_in_addr(msg, BATADV_ATTR_DAT_CACHE_IP4ADDRESS,
|
||||
dat_entry->ip) ||
|
||||
nla_put(msg, BATADV_ATTR_DAT_CACHE_HWADDRESS, ETH_ALEN,
|
||||
dat_entry->mac_addr) ||
|
||||
nla_put_u16(msg, BATADV_ATTR_DAT_CACHE_VID, dat_entry->vid) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS, msecs)) {
|
||||
genlmsg_cancel(msg, hdr);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
genlmsg_end(msg, hdr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_dat_cache_dump_bucket() - dump one bucket of the DAT cache table to
|
||||
* a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @portid: netlink port
|
||||
* @seq: Sequence number of netlink message
|
||||
* @head: bucket to dump
|
||||
* @idx_skip: How many entries to skip
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
batadv_dat_cache_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct hlist_head *head, int *idx_skip)
|
||||
{
|
||||
struct batadv_dat_entry *dat_entry;
|
||||
int idx = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(dat_entry, head, hash_entry) {
|
||||
if (idx < *idx_skip)
|
||||
goto skip;
|
||||
|
||||
if (batadv_dat_cache_dump_entry(msg, portid, seq,
|
||||
dat_entry)) {
|
||||
rcu_read_unlock();
|
||||
*idx_skip = idx;
|
||||
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
skip:
|
||||
idx++;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_dat_cache_dump() - dump DAT cache table to a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @cb: callback structure containing arguments
|
||||
*
|
||||
* Return: message length.
|
||||
*/
|
||||
int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
||||
{
|
||||
struct batadv_hard_iface *primary_if = NULL;
|
||||
int portid = NETLINK_CB(cb->skb).portid;
|
||||
struct net *net = sock_net(cb->skb->sk);
|
||||
struct net_device *soft_iface;
|
||||
struct batadv_hashtable *hash;
|
||||
struct batadv_priv *bat_priv;
|
||||
int bucket = cb->args[0];
|
||||
struct hlist_head *head;
|
||||
int idx = cb->args[1];
|
||||
int ifindex;
|
||||
int ret = 0;
|
||||
|
||||
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);
|
||||
hash = bat_priv->dat.hash;
|
||||
|
||||
primary_if = batadv_primary_if_get_selected(bat_priv);
|
||||
if (!primary_if || primary_if->if_status != BATADV_IF_ACTIVE) {
|
||||
ret = -ENOENT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
while (bucket < hash->size) {
|
||||
head = &hash->table[bucket];
|
||||
|
||||
if (batadv_dat_cache_dump_bucket(msg, portid,
|
||||
cb->nlh->nlmsg_seq, head,
|
||||
&idx))
|
||||
break;
|
||||
|
||||
bucket++;
|
||||
idx = 0;
|
||||
}
|
||||
|
||||
cb->args[0] = bucket;
|
||||
cb->args[1] = idx;
|
||||
|
||||
ret = msg->len;
|
||||
|
||||
out:
|
||||
if (primary_if)
|
||||
batadv_hardif_put(primary_if);
|
||||
|
||||
if (soft_iface)
|
||||
dev_put(soft_iface);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_arp_get_type() - parse an ARP packet and gets the type
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
|
||||
#include "originator.h"
|
||||
|
||||
struct netlink_callback;
|
||||
struct seq_file;
|
||||
struct sk_buff;
|
||||
|
||||
|
@ -81,6 +82,7 @@ batadv_dat_init_own_addr(struct batadv_priv *bat_priv,
|
|||
int batadv_dat_init(struct batadv_priv *bat_priv);
|
||||
void batadv_dat_free(struct batadv_priv *bat_priv);
|
||||
int batadv_dat_cache_seq_print_text(struct seq_file *seq, void *offset);
|
||||
int batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb);
|
||||
|
||||
/**
|
||||
* batadv_dat_inc_counter() - increment the correct DAT packet counter
|
||||
|
@ -169,6 +171,12 @@ static inline void batadv_dat_free(struct batadv_priv *bat_priv)
|
|||
{
|
||||
}
|
||||
|
||||
static inline int
|
||||
batadv_dat_cache_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline void batadv_dat_inc_counter(struct batadv_priv *bat_priv,
|
||||
u8 subtype)
|
||||
{
|
||||
|
|
|
@ -40,6 +40,7 @@
|
|||
#include <linux/list.h>
|
||||
#include <linux/lockdep.h>
|
||||
#include <linux/netdevice.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/printk.h>
|
||||
#include <linux/rculist.h>
|
||||
#include <linux/rcupdate.h>
|
||||
|
@ -52,14 +53,20 @@
|
|||
#include <linux/types.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <net/addrconf.h>
|
||||
#include <net/genetlink.h>
|
||||
#include <net/if_inet6.h>
|
||||
#include <net/ip.h>
|
||||
#include <net/ipv6.h>
|
||||
#include <net/netlink.h>
|
||||
#include <net/sock.h>
|
||||
#include <uapi/linux/batadv_packet.h>
|
||||
#include <uapi/linux/batman_adv.h>
|
||||
|
||||
#include "hard-interface.h"
|
||||
#include "hash.h"
|
||||
#include "log.h"
|
||||
#include "netlink.h"
|
||||
#include "soft-interface.h"
|
||||
#include "translation-table.h"
|
||||
#include "tvlv.h"
|
||||
|
||||
|
@ -101,8 +108,37 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface)
|
|||
return upper;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_addr_is_ipv4() - check if multicast MAC is IPv4
|
||||
* @addr: the MAC address to check
|
||||
*
|
||||
* Return: True, if MAC address is one reserved for IPv4 multicast, false
|
||||
* otherwise.
|
||||
*/
|
||||
static bool batadv_mcast_addr_is_ipv4(const u8 *addr)
|
||||
{
|
||||
static const u8 prefix[] = {0x01, 0x00, 0x5E};
|
||||
|
||||
return memcmp(prefix, addr, sizeof(prefix)) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_addr_is_ipv6() - check if multicast MAC is IPv6
|
||||
* @addr: the MAC address to check
|
||||
*
|
||||
* Return: True, if MAC address is one reserved for IPv6 multicast, false
|
||||
* otherwise.
|
||||
*/
|
||||
static bool batadv_mcast_addr_is_ipv6(const u8 *addr)
|
||||
{
|
||||
static const u8 prefix[] = {0x33, 0x33};
|
||||
|
||||
return memcmp(prefix, addr, sizeof(prefix)) == 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_mla_softif_get() - get softif multicast listeners
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
* @dev: the device to collect multicast addresses from
|
||||
* @mcast_list: a list to put found addresses into
|
||||
*
|
||||
|
@ -119,9 +155,12 @@ static struct net_device *batadv_mcast_get_bridge(struct net_device *soft_iface)
|
|||
* Return: -ENOMEM on memory allocation error or the number of
|
||||
* items added to the mcast_list otherwise.
|
||||
*/
|
||||
static int batadv_mcast_mla_softif_get(struct net_device *dev,
|
||||
static int batadv_mcast_mla_softif_get(struct batadv_priv *bat_priv,
|
||||
struct net_device *dev,
|
||||
struct hlist_head *mcast_list)
|
||||
{
|
||||
bool all_ipv4 = bat_priv->mcast.flags & BATADV_MCAST_WANT_ALL_IPV4;
|
||||
bool all_ipv6 = bat_priv->mcast.flags & BATADV_MCAST_WANT_ALL_IPV6;
|
||||
struct net_device *bridge = batadv_mcast_get_bridge(dev);
|
||||
struct netdev_hw_addr *mc_list_entry;
|
||||
struct batadv_hw_addr *new;
|
||||
|
@ -129,6 +168,12 @@ static int batadv_mcast_mla_softif_get(struct net_device *dev,
|
|||
|
||||
netif_addr_lock_bh(bridge ? bridge : dev);
|
||||
netdev_for_each_mc_addr(mc_list_entry, bridge ? bridge : dev) {
|
||||
if (all_ipv4 && batadv_mcast_addr_is_ipv4(mc_list_entry->addr))
|
||||
continue;
|
||||
|
||||
if (all_ipv6 && batadv_mcast_addr_is_ipv6(mc_list_entry->addr))
|
||||
continue;
|
||||
|
||||
new = kmalloc(sizeof(*new), GFP_ATOMIC);
|
||||
if (!new) {
|
||||
ret = -ENOMEM;
|
||||
|
@ -193,6 +238,7 @@ static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src)
|
|||
|
||||
/**
|
||||
* batadv_mcast_mla_bridge_get() - get bridged-in multicast listeners
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
* @dev: a bridge slave whose bridge to collect multicast addresses from
|
||||
* @mcast_list: a list to put found addresses into
|
||||
*
|
||||
|
@ -204,10 +250,13 @@ static void batadv_mcast_mla_br_addr_cpy(char *dst, const struct br_ip *src)
|
|||
* Return: -ENOMEM on memory allocation error or the number of
|
||||
* items added to the mcast_list otherwise.
|
||||
*/
|
||||
static int batadv_mcast_mla_bridge_get(struct net_device *dev,
|
||||
static int batadv_mcast_mla_bridge_get(struct batadv_priv *bat_priv,
|
||||
struct net_device *dev,
|
||||
struct hlist_head *mcast_list)
|
||||
{
|
||||
struct list_head bridge_mcast_list = LIST_HEAD_INIT(bridge_mcast_list);
|
||||
bool all_ipv4 = bat_priv->mcast.flags & BATADV_MCAST_WANT_ALL_IPV4;
|
||||
bool all_ipv6 = bat_priv->mcast.flags & BATADV_MCAST_WANT_ALL_IPV6;
|
||||
struct br_ip_list *br_ip_entry, *tmp;
|
||||
struct batadv_hw_addr *new;
|
||||
u8 mcast_addr[ETH_ALEN];
|
||||
|
@ -221,6 +270,12 @@ static int batadv_mcast_mla_bridge_get(struct net_device *dev,
|
|||
goto out;
|
||||
|
||||
list_for_each_entry(br_ip_entry, &bridge_mcast_list, list) {
|
||||
if (all_ipv4 && br_ip_entry->addr.proto == htons(ETH_P_IP))
|
||||
continue;
|
||||
|
||||
if (all_ipv6 && br_ip_entry->addr.proto == htons(ETH_P_IPV6))
|
||||
continue;
|
||||
|
||||
batadv_mcast_mla_br_addr_cpy(mcast_addr, &br_ip_entry->addr);
|
||||
if (batadv_mcast_mla_is_duplicate(mcast_addr, mcast_list))
|
||||
continue;
|
||||
|
@ -568,11 +623,11 @@ static void __batadv_mcast_mla_update(struct batadv_priv *bat_priv)
|
|||
if (!batadv_mcast_mla_tvlv_update(bat_priv))
|
||||
goto update;
|
||||
|
||||
ret = batadv_mcast_mla_softif_get(soft_iface, &mcast_list);
|
||||
ret = batadv_mcast_mla_softif_get(bat_priv, soft_iface, &mcast_list);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ret = batadv_mcast_mla_bridge_get(soft_iface, &mcast_list);
|
||||
ret = batadv_mcast_mla_bridge_get(bat_priv, soft_iface, &mcast_list);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
|
@ -1285,6 +1340,236 @@ int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset)
|
|||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* batadv_mcast_mesh_info_put() - put multicast info into a netlink message
|
||||
* @msg: buffer for the message
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
int batadv_mcast_mesh_info_put(struct sk_buff *msg,
|
||||
struct batadv_priv *bat_priv)
|
||||
{
|
||||
u32 flags = bat_priv->mcast.flags;
|
||||
u32 flags_priv = BATADV_NO_FLAGS;
|
||||
|
||||
if (bat_priv->mcast.bridged) {
|
||||
flags_priv |= BATADV_MCAST_FLAGS_BRIDGED;
|
||||
|
||||
if (bat_priv->mcast.querier_ipv4.exists)
|
||||
flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS;
|
||||
if (bat_priv->mcast.querier_ipv6.exists)
|
||||
flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS;
|
||||
if (bat_priv->mcast.querier_ipv4.shadowing)
|
||||
flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING;
|
||||
if (bat_priv->mcast.querier_ipv6.shadowing)
|
||||
flags_priv |= BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING;
|
||||
}
|
||||
|
||||
if (nla_put_u32(msg, BATADV_ATTR_MCAST_FLAGS, flags) ||
|
||||
nla_put_u32(msg, BATADV_ATTR_MCAST_FLAGS_PRIV, flags_priv))
|
||||
return -EMSGSIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_flags_dump_entry() - dump one entry of the multicast flags table
|
||||
* to a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @portid: netlink port
|
||||
* @seq: Sequence number of netlink message
|
||||
* @orig_node: originator to dump the multicast flags of
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
batadv_mcast_flags_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_orig_node *orig_node)
|
||||
{
|
||||
void *hdr;
|
||||
|
||||
hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family,
|
||||
NLM_F_MULTI, BATADV_CMD_GET_MCAST_FLAGS);
|
||||
if (!hdr)
|
||||
return -ENOBUFS;
|
||||
|
||||
if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN,
|
||||
orig_node->orig)) {
|
||||
genlmsg_cancel(msg, hdr);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
if (test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
|
||||
&orig_node->capabilities)) {
|
||||
if (nla_put_u32(msg, BATADV_ATTR_MCAST_FLAGS,
|
||||
orig_node->mcast_flags)) {
|
||||
genlmsg_cancel(msg, hdr);
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
}
|
||||
|
||||
genlmsg_end(msg, hdr);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_flags_dump_bucket() - dump one bucket of the multicast flags
|
||||
* table to a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @portid: netlink port
|
||||
* @seq: Sequence number of netlink message
|
||||
* @head: bucket to dump
|
||||
* @idx_skip: How many entries to skip
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
batadv_mcast_flags_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct hlist_head *head, long *idx_skip)
|
||||
{
|
||||
struct batadv_orig_node *orig_node;
|
||||
long idx = 0;
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(orig_node, head, hash_entry) {
|
||||
if (!test_bit(BATADV_ORIG_CAPA_HAS_MCAST,
|
||||
&orig_node->capa_initialized))
|
||||
continue;
|
||||
|
||||
if (idx < *idx_skip)
|
||||
goto skip;
|
||||
|
||||
if (batadv_mcast_flags_dump_entry(msg, portid, seq,
|
||||
orig_node)) {
|
||||
rcu_read_unlock();
|
||||
*idx_skip = idx;
|
||||
|
||||
return -EMSGSIZE;
|
||||
}
|
||||
|
||||
skip:
|
||||
idx++;
|
||||
}
|
||||
rcu_read_unlock();
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* __batadv_mcast_flags_dump() - dump multicast flags table to a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @portid: netlink port
|
||||
* @seq: Sequence number of netlink message
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
* @bucket: current bucket to dump
|
||||
* @idx: index in current bucket to the next entry to dump
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
__batadv_mcast_flags_dump(struct sk_buff *msg, u32 portid, u32 seq,
|
||||
struct batadv_priv *bat_priv, long *bucket, long *idx)
|
||||
{
|
||||
struct batadv_hashtable *hash = bat_priv->orig_hash;
|
||||
long bucket_tmp = *bucket;
|
||||
struct hlist_head *head;
|
||||
long idx_tmp = *idx;
|
||||
|
||||
while (bucket_tmp < hash->size) {
|
||||
head = &hash->table[bucket_tmp];
|
||||
|
||||
if (batadv_mcast_flags_dump_bucket(msg, portid, seq, head,
|
||||
&idx_tmp))
|
||||
break;
|
||||
|
||||
bucket_tmp++;
|
||||
idx_tmp = 0;
|
||||
}
|
||||
|
||||
*bucket = bucket_tmp;
|
||||
*idx = idx_tmp;
|
||||
|
||||
return msg->len;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_netlink_get_primary() - get primary interface from netlink
|
||||
* callback
|
||||
* @cb: netlink callback structure
|
||||
* @primary_if: the primary interface pointer to return the result in
|
||||
*
|
||||
* Return: 0 or error code.
|
||||
*/
|
||||
static int
|
||||
batadv_mcast_netlink_get_primary(struct netlink_callback *cb,
|
||||
struct batadv_hard_iface **primary_if)
|
||||
{
|
||||
struct batadv_hard_iface *hard_iface = NULL;
|
||||
struct net *net = sock_net(cb->skb->sk);
|
||||
struct net_device *soft_iface;
|
||||
struct batadv_priv *bat_priv;
|
||||
int ifindex;
|
||||
int ret = 0;
|
||||
|
||||
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);
|
||||
|
||||
hard_iface = batadv_primary_if_get_selected(bat_priv);
|
||||
if (!hard_iface || hard_iface->if_status != BATADV_IF_ACTIVE) {
|
||||
ret = -ENOENT;
|
||||
goto out;
|
||||
}
|
||||
|
||||
out:
|
||||
if (soft_iface)
|
||||
dev_put(soft_iface);
|
||||
|
||||
if (!ret && primary_if)
|
||||
*primary_if = hard_iface;
|
||||
else
|
||||
batadv_hardif_put(hard_iface);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_flags_dump() - dump multicast flags table to a netlink socket
|
||||
* @msg: buffer for the message
|
||||
* @cb: callback structure containing arguments
|
||||
*
|
||||
* Return: message length.
|
||||
*/
|
||||
int batadv_mcast_flags_dump(struct sk_buff *msg, struct netlink_callback *cb)
|
||||
{
|
||||
struct batadv_hard_iface *primary_if = NULL;
|
||||
int portid = NETLINK_CB(cb->skb).portid;
|
||||
struct batadv_priv *bat_priv;
|
||||
long *bucket = &cb->args[0];
|
||||
long *idx = &cb->args[1];
|
||||
int ret;
|
||||
|
||||
ret = batadv_mcast_netlink_get_primary(cb, &primary_if);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
bat_priv = netdev_priv(primary_if->soft_iface);
|
||||
ret = __batadv_mcast_flags_dump(msg, portid, cb->nlh->nlmsg_seq,
|
||||
bat_priv, bucket, idx);
|
||||
|
||||
batadv_hardif_put(primary_if);
|
||||
return ret;
|
||||
}
|
||||
|
||||
/**
|
||||
* batadv_mcast_free() - free the multicast optimizations structures
|
||||
* @bat_priv: the bat priv with all the soft interface information
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include "main.h"
|
||||
|
||||
struct netlink_callback;
|
||||
struct seq_file;
|
||||
struct sk_buff;
|
||||
|
||||
|
@ -54,6 +55,11 @@ void batadv_mcast_init(struct batadv_priv *bat_priv);
|
|||
|
||||
int batadv_mcast_flags_seq_print_text(struct seq_file *seq, void *offset);
|
||||
|
||||
int batadv_mcast_mesh_info_put(struct sk_buff *msg,
|
||||
struct batadv_priv *bat_priv);
|
||||
|
||||
int batadv_mcast_flags_dump(struct sk_buff *msg, struct netlink_callback *cb);
|
||||
|
||||
void batadv_mcast_free(struct batadv_priv *bat_priv);
|
||||
|
||||
void batadv_mcast_purge_orig(struct batadv_orig_node *orig_node);
|
||||
|
@ -72,6 +78,18 @@ static inline int batadv_mcast_init(struct batadv_priv *bat_priv)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
batadv_mcast_mesh_info_put(struct sk_buff *msg, struct batadv_priv *bat_priv)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static inline int batadv_mcast_flags_dump(struct sk_buff *msg,
|
||||
struct netlink_callback *cb)
|
||||
{
|
||||
return -EOPNOTSUPP;
|
||||
}
|
||||
|
||||
static inline void batadv_mcast_free(struct batadv_priv *bat_priv)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -45,8 +45,10 @@
|
|||
|
||||
#include "bat_algo.h"
|
||||
#include "bridge_loop_avoidance.h"
|
||||
#include "distributed-arp-table.h"
|
||||
#include "gateway_client.h"
|
||||
#include "hard-interface.h"
|
||||
#include "multicast.h"
|
||||
#include "originator.h"
|
||||
#include "soft-interface.h"
|
||||
#include "tp_meter.h"
|
||||
|
@ -64,39 +66,44 @@ static const struct genl_multicast_group batadv_netlink_mcgrps[] = {
|
|||
};
|
||||
|
||||
static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = {
|
||||
[BATADV_ATTR_VERSION] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_MESH_IFNAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_MESH_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_HARD_IFINDEX] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_HARD_IFNAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_HARD_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_ORIG_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TPMETER_RESULT] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TPMETER_TEST_TIME] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_TPMETER_BYTES] = { .type = NLA_U64 },
|
||||
[BATADV_ATTR_TPMETER_COOKIE] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_ACTIVE] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_TT_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TT_TTVN] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TT_LAST_TTVN] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TT_CRC32] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_TT_VID] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_TT_FLAGS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_FLAG_BEST] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_LAST_SEEN_MSECS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_NEIGH_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TQ] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_THROUGHPUT] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_ROUTER] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_BLA_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_VID] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_BLA_BACKBONE] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_VERSION] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_ALGO_NAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_MESH_IFINDEX] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_MESH_IFNAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_MESH_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_HARD_IFINDEX] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_HARD_IFNAME] = { .type = NLA_STRING },
|
||||
[BATADV_ATTR_HARD_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_ORIG_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TPMETER_RESULT] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TPMETER_TEST_TIME] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_TPMETER_BYTES] = { .type = NLA_U64 },
|
||||
[BATADV_ATTR_TPMETER_COOKIE] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_ACTIVE] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_TT_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TT_TTVN] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TT_LAST_TTVN] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_TT_CRC32] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_TT_VID] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_TT_FLAGS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_FLAG_BEST] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_LAST_SEEN_MSECS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_NEIGH_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_TQ] = { .type = NLA_U8 },
|
||||
[BATADV_ATTR_THROUGHPUT] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_BANDWIDTH_UP] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_BANDWIDTH_DOWN] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_ROUTER] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_OWN] = { .type = NLA_FLAG },
|
||||
[BATADV_ATTR_BLA_ADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_VID] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_BLA_BACKBONE] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_BLA_CRC] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_DAT_CACHE_IP4ADDRESS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_DAT_CACHE_HWADDRESS] = { .len = ETH_ALEN },
|
||||
[BATADV_ATTR_DAT_CACHE_VID] = { .type = NLA_U16 },
|
||||
[BATADV_ATTR_MCAST_FLAGS] = { .type = NLA_U32 },
|
||||
[BATADV_ATTR_MCAST_FLAGS_PRIV] = { .type = NLA_U32 },
|
||||
};
|
||||
|
||||
/**
|
||||
|
@ -147,6 +154,9 @@ batadv_netlink_mesh_info_put(struct sk_buff *msg, struct net_device *soft_iface)
|
|||
goto out;
|
||||
#endif
|
||||
|
||||
if (batadv_mcast_mesh_info_put(msg, bat_priv))
|
||||
goto out;
|
||||
|
||||
primary_if = batadv_primary_if_get_selected(bat_priv);
|
||||
if (primary_if && primary_if->if_status == BATADV_IF_ACTIVE) {
|
||||
hard_iface = primary_if->net_dev;
|
||||
|
@ -604,6 +614,18 @@ static const struct genl_ops batadv_netlink_ops[] = {
|
|||
.policy = batadv_netlink_policy,
|
||||
.dumpit = batadv_bla_backbone_dump,
|
||||
},
|
||||
{
|
||||
.cmd = BATADV_CMD_GET_DAT_CACHE,
|
||||
.flags = GENL_ADMIN_PERM,
|
||||
.policy = batadv_netlink_policy,
|
||||
.dumpit = batadv_dat_cache_dump,
|
||||
},
|
||||
{
|
||||
.cmd = BATADV_CMD_GET_MCAST_FLAGS,
|
||||
.flags = GENL_ADMIN_PERM,
|
||||
.policy = batadv_netlink_policy,
|
||||
.dumpit = batadv_mcast_flags_dump,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in New Issue