proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-30 01:16:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nhrpd: fix netlink neigh message handling for lladdr

Browse Source 
Signed-off-by: Ghasem Naddaf <gshirazi@infoblox.com>
This commit is contained in:
Ghasem Naddaf 2020-02-27 10:22:39 -08:00
parent 5e34d224ea
commit e9178b8ba3
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
nhrpd/netlink_arp.c
View File

@ -65,9 +65,9 @@ static void netlink_neigh_msg(struct nlmsghdr *msg, struct zbuf *zb)
struct nhrp_cache *c; struct nhrp_cache *c;
struct interface *ifp; struct interface *ifp;
struct zbuf payload; struct zbuf payload;
union sockunion addr; union sockunion addr, lladdr;
size_t len; size_t len;
char buf[SU_ADDRSTRLEN]; char buf[4][SU_ADDRSTRLEN];
int state; int state;
ndm = znl_pull(zb, sizeof(*ndm)); ndm = znl_pull(zb, sizeof(*ndm));
@ -82,6 +82,10 @@ static void netlink_neigh_msg(struct nlmsghdr *msg, struct zbuf *zb)
sockunion_set(&addr, ndm->ndm_family, sockunion_set(&addr, ndm->ndm_family,
zbuf_pulln(&payload, len), len); zbuf_pulln(&payload, len), len);
break; break;
case NDA_LLADDR:
sockunion_set(&lladdr, ndm->ndm_family,
zbuf_pulln(&payload, len), len);
break;
} }
} }
@ -93,20 +97,36 @@ static void netlink_neigh_msg(struct nlmsghdr *msg, struct zbuf *zb)
if (!c) if (!c)
return; return;
if (msg->nlmsg_type == RTM_GETNEIGH) { debugf(NHRP_DEBUG_KERNEL,
debugf(NHRP_DEBUG_KERNEL, "Netlink: who-has %s dev %s", "Netlink: %s %s dev %s lladdr %s nud 0x%x "
sockunion2str(&addr, buf, sizeof buf), ifp->name); "cache used %u type %u",
(msg->nlmsg_type == RTM_GETNEIGH)
? "who-has"
: (msg->nlmsg_type == RTM_NEWNEIGH) ? "new-neigh"
: "del-neigh",
sockunion2str(&addr, buf[0], sizeof(buf[0])), ifp->name,
sockunion2str(&lladdr, buf[1], sizeof(buf[1])), ndm->ndm_state,
c->used, c->cur.type);
if (msg->nlmsg_type == RTM_GETNEIGH) {
if (c->cur.type >= NHRP_CACHE_CACHED) { if (c->cur.type >= NHRP_CACHE_CACHED) {
nhrp_cache_set_used(c, 1); nhrp_cache_set_used(c, 1);
netlink_update_binding(ifp, &addr, debugf(NHRP_DEBUG_KERNEL,
&c->cur.peer->vc->remote.nbma); "Netlink: update binding for %s dev %s from c "
"%s peer.vc.nbma %s to lladdr %s",
sockunion2str(&addr, buf[0], sizeof(buf[0])),
ifp->name,
sockunion2str(&c->cur.remote_nbma_natoa, buf[1],
sizeof(buf[1])),
sockunion2str(&c->cur.peer->vc->remote.nbma,
buf[2], sizeof(buf[2])),
sockunion2str(&lladdr, buf[3], sizeof(buf[3])));
/* In case of shortcuts, nbma is given by lladdr, not
* vc->remote.nbma.
*/
netlink_update_binding(ifp, &addr, &lladdr);
} }
} else { } else {
debugf(NHRP_DEBUG_KERNEL, "Netlink: update %s dev %s nud %x",
sockunion2str(&addr, buf, sizeof buf), ifp->name,
ndm->ndm_state);
state = (msg->nlmsg_type == RTM_NEWNEIGH) ? ndm->ndm_state state = (msg->nlmsg_type == RTM_NEWNEIGH) ? ndm->ndm_state
: NUD_FAILED; : NUD_FAILED;
nhrp_cache_set_used(c, state == NUD_REACHABLE); nhrp_cache_set_used(c, state == NUD_REACHABLE);