proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-08 18:12:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #15350 from FRRouting/mergify/bp/stable/9.1/pr-15316

Browse Source 
nhrp: fix race condition in  null lladdr from zebra (backport #15316)
This commit is contained in:
Donatas Abraitis 2024-02-10 16:55:21 +02:00 committed by GitHub
commit fde18a006f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nhrpd/netlink_arp.c
View File

@ -184,6 +184,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.
*/ */