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

Merge pull request #8700 from idryzhov/coverity

Browse Source 
fix a couple of coverity warnings
This commit is contained in:
Mark Stapp 2021-05-19 15:56:17 -04:00 committed by GitHub
commit e804e2597c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/northbound.c
View File

@ -599,6 +599,7 @@ static void nb_config_diff(const struct nb_config *config1,
* the diff tree. * the diff tree.
*/ */
target = yang_dnode_get(config2->dnode, path); target = yang_dnode_get(config2->dnode, path);
assert(target);
nb_config_diff_created(target, &seq, changes); nb_config_diff_created(target, &seq, changes);
/* Skip rest of sub-tree, move to next sibling /* Skip rest of sub-tree, move to next sibling
@ -607,6 +608,7 @@ static void nb_config_diff(const struct nb_config *config1,
break; break;
case 'd': /* delete */ case 'd': /* delete */
target = yang_dnode_get(config1->dnode, path); target = yang_dnode_get(config1->dnode, path);
assert(target);
nb_config_diff_deleted(target, &seq, changes); nb_config_diff_deleted(target, &seq, changes);
/* Skip rest of sub-tree, move to next sibling /* Skip rest of sub-tree, move to next sibling

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