proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-07-27 11:44:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #201 from opensourcerouting/fixes/coverity-isis

Browse Source 
isisd: address coverity findings
This commit is contained in:
Donald Sharp 2017-02-13 21:37:37 -05:00 committed by GitHub
commit c11c520e79
6 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
isisd/dict.c
View File

@ -649,6 +649,7 @@ dnode_t *dict_delete(dict_t *dict, dnode_t *delete)
if (delete->left != nil && delete->right != nil) { if (delete->left != nil && delete->right != nil) {
dnode_t *next = dict_next(dict, delete); dnode_t *next = dict_next(dict, delete);
assert (next);
dnode_t *nextparent = next->parent; dnode_t *nextparent = next->parent;
dnode_color_t nextcolor = next->color; dnode_color_t nextcolor = next->color;

4
isisd/isis_circuit.c
View File

@ -308,12 +308,12 @@ isis_circuit_del_addr (struct isis_circuit *circuit,
else else
{ {
prefix2str (connected->address, buf, sizeof (buf)); prefix2str (connected->address, buf, sizeof (buf));
zlog_warn ("Nonexitant ip address %s removal attempt from \ zlog_warn ("Nonexistant ip address %s removal attempt from \
circuit %d", buf, circuit->circuit_id); circuit %d", buf, circuit->circuit_id);
zlog_warn ("Current ip addresses on %s:", circuit->interface->name); zlog_warn ("Current ip addresses on %s:", circuit->interface->name);
for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node, ip)) for (ALL_LIST_ELEMENTS_RO(circuit->ip_addrs, node, ip))
{ {
prefix2str((struct prefix*)ip, (char *)buf, BUFSIZ); prefix2str(ip, buf, sizeof(buf));
zlog_warn(" %s", buf); zlog_warn(" %s", buf);
} }
zlog_warn("End of addresses"); zlog_warn("End of addresses");

3
isisd/isis_lsp.c
View File

@ -2484,8 +2484,7 @@ lsp_regenerate_schedule_pseudo (struct isis_circuit *circuit, int level)
int lvl; int lvl;
struct isis_area *area = circuit->area; struct isis_area *area = circuit->area;
if (circuit == NULL || if (circuit->circ_type != CIRCUIT_T_BROADCAST ||
circuit->circ_type != CIRCUIT_T_BROADCAST ||
circuit->state != C_STATE_UP) circuit->state != C_STATE_UP)
return ISIS_OK; return ISIS_OK;

4
isisd/isis_pdu.c
View File

@ -2430,7 +2430,7 @@ send_lan_l1_hello (struct thread *thread)
} }
if (circuit->u.bc.run_dr_elect[0]) if (circuit->u.bc.run_dr_elect[0])
retval = isis_dr_elect (circuit, 1); isis_dr_elect (circuit, 1);
retval = send_hello (circuit, 1); retval = send_hello (circuit, 1);
@ -2460,7 +2460,7 @@ send_lan_l2_hello (struct thread *thread)
} }
if (circuit->u.bc.run_dr_elect[1]) if (circuit->u.bc.run_dr_elect[1])
retval = isis_dr_elect (circuit, 2); isis_dr_elect (circuit, 2);
retval = send_hello (circuit, 2); retval = send_hello (circuit, 2);

10
isisd/isis_route.c
View File

@ -585,10 +585,14 @@ isis_route_validate_merge (struct isis_area *area, int family)
if (family == AF_INET) if (family == AF_INET)
table = area->route_table[0]; table = area->route_table[0];
#ifdef HAVE_IPV6
else if (family == AF_INET6) else if (family == AF_INET6)
table = area->route_table6[0]; table = area->route_table6[0];
#endif else
{
zlog_warn ("ISIS-Rte (%s) %s called for unknown family %d",
area->area_tag, __func__, family);
return;
}
for (rnode = route_top (table); rnode; rnode = route_next (rnode)) for (rnode = route_top (table); rnode; rnode = route_next (rnode))
{ {
@ -600,10 +604,8 @@ isis_route_validate_merge (struct isis_area *area, int family)
if (family == AF_INET) if (family == AF_INET)
table = area->route_table[1]; table = area->route_table[1];
#ifdef HAVE_IPV6
else if (family == AF_INET6) else if (family == AF_INET6)
table = area->route_table6[1]; table = area->route_table6[1];
#endif
for (rnode = route_top (table); rnode; rnode = route_next (rnode)) for (rnode = route_top (table); rnode; rnode = route_next (rnode))
{ {

17
isisd/isis_te.c
View File

@ -985,17 +985,15 @@ show_vty_unknown_tlv (struct vty *vty, struct subtlv_header *tlvh)
void void
mpls_te_print_detail(struct vty *vty, struct te_is_neigh *te) mpls_te_print_detail(struct vty *vty, struct te_is_neigh *te)
{ {
struct subtlv_header *tlvh, *next; struct subtlv_header *tlvh;
u_int16_t sum = 0; u_int16_t sum = 0;
zlog_debug ("ISIS MPLS-TE: Show database TE detail"); zlog_debug ("ISIS MPLS-TE: Show database TE detail");
tlvh = (struct subtlv_header *)te->sub_tlvs; tlvh = (struct subtlv_header *)te->sub_tlvs;
for (; sum < te->sub_tlvs_length; tlvh = (next ? next : SUBTLV_HDR_NEXT (tlvh))) for (; sum < te->sub_tlvs_length; tlvh = SUBTLV_HDR_NEXT (tlvh))
{ {
next = NULL;
switch (tlvh->type) switch (tlvh->type)
{ {
case TE_SUBTLV_ADMIN_GRP: case TE_SUBTLV_ADMIN_GRP:
@ -1222,13 +1220,10 @@ DEFUN (show_isis_mpls_te_router,
{ {
vty_out (vty, "--- MPLS-TE router parameters ---%s", VTY_NEWLINE); vty_out (vty, "--- MPLS-TE router parameters ---%s", VTY_NEWLINE);
if (vty != NULL) if (ntohs (isisMplsTE.router_id.s_addr) != 0)
{ vty_out (vty, " Router-Address: %s%s", inet_ntoa (isisMplsTE.router_id), VTY_NEWLINE);
if (ntohs (isisMplsTE.router_id.s_addr) != 0) else
vty_out (vty, " Router-Address: %s%s", inet_ntoa (isisMplsTE.router_id), VTY_NEWLINE); vty_out (vty, " N/A%s", VTY_NEWLINE);
else
vty_out (vty, " N/A%s", VTY_NEWLINE);
}
} }
else else
vty_out (vty, " MPLS-TE is disable on this router%s", VTY_NEWLINE); vty_out (vty, " MPLS-TE is disable on this router%s", VTY_NEWLINE);