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

Merge pull request #2514 from pacovn/Coverity_1462467_1465497_Control_flow_issues

Browse Source 
zebra: control flow issues (Coverity 1462467 1465497)
This commit is contained in:
Russ White 2018-06-29 13:24:42 -04:00 committed by GitHub
commit 42edc48606
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zebra/zebra_netns_id.c
View File

@ -307,7 +307,7 @@ ns_id_t zebra_ns_id_get(const char *netnspath)
nlh = (struct nlmsghdr *)((char *)nlh nlh = (struct nlmsghdr *)((char *)nlh
+ NETLINK_ALIGN( + NETLINK_ALIGN(
nlh->nlmsg_len)); nlh->nlmsg_len));
} while (len != 0 && return_nsid != NS_UNKNOWN && ret == 0); } while (len != 0 && ret == 0);
} }
close(fd); close(fd);

12
zebra/zebra_rib.c
View File

@ -1428,18 +1428,14 @@ static void rib_process_update_fib(struct zebra_vrf *zvrf,
if (new != old) if (new != old)
zlog_debug( zlog_debug(
"%u:%s: Deleting route rn %p, re %p (type %d) " "%u:%s: Deleting route rn %p, re %p (type %d) "
"old %p (type %d) - %s", "old %p (type %d) - nexthop inactive",
zvrf_id(zvrf), buf, rn, new, zvrf_id(zvrf), buf, rn, new,
new->type, old, old->type, new->type, old, old->type);
nh_active ? "install failed"
: "nexthop inactive");
else else
zlog_debug( zlog_debug(
"%u:%s: Deleting route rn %p, re %p (type %d) - %s", "%u:%s: Deleting route rn %p, re %p (type %d) - nexthop inactive",
zvrf_id(zvrf), buf, rn, new, zvrf_id(zvrf), buf, rn, new,
new->type, new->type);
nh_active ? "install failed"
: "nexthop inactive");
} }
/* If labeled-unicast route, uninstall transit LSP. */ /* If labeled-unicast route, uninstall transit LSP. */