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

pbrd: fix coverity warning

Browse Source 
CID 1500586

There was an attempt to fix it in 920bb6f7 but the commit didn't
actually fix the warning.

Signed-off-by: Igor Ryzhov <iryzhov@nfware.com>
This commit is contained in:
Igor Ryzhov 2021-05-19 16:24:21 +03:00
parent f96c2b6dc2
commit 3558b8b8b4
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pbrd/pbr_nht.c
View File

@ -721,7 +721,7 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
* So let's search and do the right thing on the
* interface event.
*/
if (!pnhi->nhr && pnhi->ifp) {
if (!pnhi->nhr) {
switch (pnhc->nexthop.type) {
case NEXTHOP_TYPE_BLACKHOLE:
case NEXTHOP_TYPE_IPV4:
@ -738,20 +738,18 @@ pbr_nht_individual_nexthop_gw_update(struct pbr_nexthop_cache *pnhc,
goto done;
}
if (pnhi->nhr) {
switch (pnhi->nhr->prefix.family) {
case AF_INET:
if (pnhc->nexthop.gate.ipv4.s_addr
!= pnhi->nhr->prefix.u.prefix4.s_addr)
goto done; /* Unrelated change */
break;
case AF_INET6:
if (memcmp(&pnhc->nexthop.gate.ipv6,
&pnhi->nhr->prefix.u.prefix6, 16)
!= 0)
goto done; /* Unrelated change */
break;
}
switch (pnhi->nhr->prefix.family) {
case AF_INET:
if (pnhc->nexthop.gate.ipv4.s_addr
!= pnhi->nhr->prefix.u.prefix4.s_addr)
goto done; /* Unrelated change */
break;
case AF_INET6:
if (memcmp(&pnhc->nexthop.gate.ipv6,
&pnhi->nhr->prefix.u.prefix6, 16)
!= 0)
goto done; /* Unrelated change */
break;
}
pnhi->nhr_matched = true;