mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-08 07:37:29 +00:00
Merge pull request #15316 from LabNConsulting/working/lb/nhrp-nexthop-race-cond
nhrp: fix race condition in null lladdr from zebra
This commit is contained in:
commit
9e42c61305
@ -191,6 +191,11 @@ int nhrp_neighbor_operation(ZAPI_CALLBACK_ARGS)
|
|||||||
"Netlink: update binding for %pSU dev %s from c %pSU peer.vc.nbma %pSU to lladdr %pSU",
|
"Netlink: update binding for %pSU dev %s from c %pSU peer.vc.nbma %pSU to lladdr %pSU",
|
||||||
&addr, ifp->name, &c->cur.remote_nbma_natoa,
|
&addr, ifp->name, &c->cur.remote_nbma_natoa,
|
||||||
&c->cur.peer->vc->remote.nbma, &lladdr);
|
&c->cur.peer->vc->remote.nbma, &lladdr);
|
||||||
|
|
||||||
|
if (lladdr.sa.sa_family == AF_UNSPEC)
|
||||||
|
/* nothing from zebra, so use nhrp peer */
|
||||||
|
lladdr = c->cur.peer->vc->remote.nbma;
|
||||||
|
|
||||||
/* In case of shortcuts, nbma is given by lladdr, not
|
/* In case of shortcuts, nbma is given by lladdr, not
|
||||||
* vc->remote.nbma.
|
* vc->remote.nbma.
|
||||||
*/
|
*/
|
||||||
|
Loading…
Reference in New Issue
Block a user