neigh: add function to look up neighbour (fdb) by ifindex, mac and vlan

The rtnl_neigh_get() function can not be used to look up a fdb entry in the
neigh cache. This is due to that the function searches among destination
addresses (NDA_DST) and not among link layer addresses (NDA_LLADDR), which is
used by fdb entries. A fdb entry can also exist in several vlans, so a vlan id
parameter is also needed to find a unique entry.
This commit adds a function, rtnl_neigh_get_by_vlan() which searches the neigh
cache for a specific neighbour (fdb) entry by interface index, link layer
address and vlan id.

Signed-off-by: Jonas Johansson <jonas.johansson@westermo.se>
Signed-off-by: Thomas Haller <thaller@redhat.com>

http://lists.infradead.org/pipermail/libnl/2016-May/002124.html
https://github.com/thom311/libnl/pull/98
This commit is contained in:
Jonas Johansson 2016-04-28 16:07:11 +02:00 committed by Thomas Haller
parent 648338a217
commit 3bf503d30c
3 changed files with 29 additions and 0 deletions

View File

@ -31,6 +31,8 @@ extern int rtnl_neigh_alloc_cache_flags(struct nl_sock *,
unsigned int); unsigned int);
extern struct rtnl_neigh *rtnl_neigh_get(struct nl_cache *, int, extern struct rtnl_neigh *rtnl_neigh_get(struct nl_cache *, int,
struct nl_addr *); struct nl_addr *);
extern struct rtnl_neigh *rtnl_neigh_get_by_vlan(struct nl_cache *, int,
struct nl_addr *, int);
extern int rtnl_neigh_parse(struct nlmsghdr *, struct rtnl_neigh **); extern int rtnl_neigh_parse(struct nlmsghdr *, struct rtnl_neigh **);

View File

@ -607,6 +607,32 @@ struct rtnl_neigh * rtnl_neigh_get(struct nl_cache *cache, int ifindex,
return NULL; return NULL;
} }
/**
* Look up a neighbour by interface index, link layer address and vlan id
* @arg cache neighbour cache
* @arg ifindex interface index the neighbour is on
* @arg lladdr link layer address of the neighbour
* @arg vlan vlan id of the neighbour
*
* @return neighbour handle or NULL if no match was found.
*/
struct rtnl_neigh * rtnl_neigh_get_by_vlan(struct nl_cache *cache, int ifindex,
struct nl_addr *lladdr, int vlan)
{
struct rtnl_neigh *neigh;
nl_list_for_each_entry(neigh, &cache->c_items, ce_list) {
if (neigh->n_ifindex == ifindex &&
neigh->n_vlan == vlan &&
neigh->n_lladdr && !nl_addr_cmp(neigh->n_lladdr, lladdr)) {
nl_object_get((struct nl_object *) neigh);
return neigh;
}
}
return NULL;
}
/** @} */ /** @} */
/** /**

View File

@ -917,5 +917,6 @@ global:
rtnl_link_vrf_get_tableid; rtnl_link_vrf_get_tableid;
rtnl_link_vrf_set_tableid; rtnl_link_vrf_set_tableid;
rtnl_neigh_alloc_cache_flags; rtnl_neigh_alloc_cache_flags;
rtnl_neigh_ll_get;
} libnl_3_2_27; } libnl_3_2_27;