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

Merge pull request #7124 from volta-networks/fix_ldp_sync_isis_nb

Browse Source 
isisd: fix coverity errors in isis ldp-sync commands
This commit is contained in:
Renato Westphal 2020-10-05 13:04:15 -03:00 committed by GitHub
commit a192cf4811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 60 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
isisd/isis_nb_config.c
View File

@ -85,15 +85,13 @@ int isis_instance_destroy(struct nb_cb_destroy_args *args)
if (args->event != NB_EV_APPLY) if (args->event != NB_EV_APPLY)
return NB_OK; return NB_OK;
area = nb_running_unset_entry(args->dnode); area = nb_running_unset_entry(args->dnode);
vrf_id = area->isis->vrf_id; vrf_id = area->isis->vrf_id;
isis_area_destroy(area);
/* remove ldp-sync config */ /* remove ldp-sync config */
if (vrf_id == VRF_DEFAULT) if (vrf_id == VRF_DEFAULT)
isis_ldp_sync_gbl_exit(true); isis_ldp_sync_gbl_exit(true);
isis_area_destroy(area);
return NB_OK; return NB_OK;
} }
@ -1847,18 +1845,29 @@ int isis_instance_mpls_ldp_sync_create(struct nb_cb_create_args *args)
struct listnode *node; struct listnode *node;
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct interface *ifp; struct interface *ifp;
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); struct vrf *vrf;
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT); struct isis *isis;
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if (isis == NULL) area = nb_running_get_entry(args->dnode, NULL, false);
if (area == NULL || area->isis == NULL)
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
if (area->isis->vrf_id != VRF_DEFAULT) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
}
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
area = nb_running_get_entry(args->dnode, NULL, true);
isis = area->isis;
vrf = vrf_lookup_by_id(isis->vrf_id);
/* register with opaque client to recv LDP-IGP Sync msgs */ /* register with opaque client to recv LDP-IGP Sync msgs */
zclient_register_opaque(zclient, LDP_IGP_SYNC_IF_STATE_UPDATE); zclient_register_opaque(zclient, LDP_IGP_SYNC_IF_STATE_UPDATE);
zclient_register_opaque(zclient, LDP_IGP_SYNC_ANNOUNCE_UPDATE); zclient_register_opaque(zclient, LDP_IGP_SYNC_ANNOUNCE_UPDATE);
@ -1906,19 +1915,29 @@ int isis_instance_mpls_ldp_sync_holddown_modify(struct nb_cb_modify_args *args)
struct listnode *node; struct listnode *node;
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct interface *ifp; struct interface *ifp;
struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); struct vrf *vrf;
uint16_t holddown = LDP_IGP_SYNC_HOLDDOWN_DEFAULT; uint16_t holddown = LDP_IGP_SYNC_HOLDDOWN_DEFAULT;
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT); struct isis *isis;
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if (isis == NULL) area = nb_running_get_entry(args->dnode, NULL, false);
if (area == NULL || area->isis == NULL)
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
if (area->isis->vrf_id != VRF_DEFAULT) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
}
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
area = nb_running_get_entry(args->dnode, NULL, true);
isis = area->isis;
vrf = vrf_lookup_by_id(isis->vrf_id);
holddown = yang_dnode_get_uint16(args->dnode, NULL); holddown = yang_dnode_get_uint16(args->dnode, NULL);
if (holddown == LDP_IGP_SYNC_HOLDDOWN_DEFAULT) if (holddown == LDP_IGP_SYNC_HOLDDOWN_DEFAULT)
@ -2778,23 +2797,31 @@ int lib_interface_isis_mpls_ldp_sync_modify(struct nb_cb_modify_args *args)
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct ldp_sync_info *ldp_sync_info; struct ldp_sync_info *ldp_sync_info;
bool ldp_sync_enable; bool ldp_sync_enable;
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT); struct isis *isis;
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if (isis == NULL) circuit = nb_running_get_entry(args->dnode, NULL, false);
if (circuit == NULL || circuit->area == NULL)
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
break;
if (circuit->area->isis->vrf_id != VRF_DEFAULT) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
}
break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
circuit = nb_running_get_entry(args->dnode, NULL, true); circuit = nb_running_get_entry(args->dnode, NULL, true);
ldp_sync_enable = yang_dnode_get_bool(args->dnode, NULL); ldp_sync_enable = yang_dnode_get_bool(args->dnode, NULL);
isis = circuit->area->isis;
if (circuit->ldp_sync_info == NULL) if (circuit->ldp_sync_info == NULL)
isis_ldp_sync_if_init(circuit, isis); isis_ldp_sync_if_init(circuit, isis);
assert(circuit->ldp_sync_info != NULL);
ldp_sync_info = circuit->ldp_sync_info; ldp_sync_info = circuit->ldp_sync_info;
if (ldp_sync_enable) { if (ldp_sync_enable) {
@ -2838,23 +2865,31 @@ int lib_interface_isis_mpls_holddown_modify(struct nb_cb_modify_args *args)
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct ldp_sync_info *ldp_sync_info; struct ldp_sync_info *ldp_sync_info;
uint16_t holddown; uint16_t holddown;
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT); struct isis *isis;
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if (isis == NULL) circuit = nb_running_get_entry(args->dnode, NULL, false);
if (circuit == NULL || circuit->area == NULL)
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
break;
if (circuit->area->isis->vrf_id != VRF_DEFAULT) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
}
break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
circuit = nb_running_get_entry(args->dnode, NULL, true); circuit = nb_running_get_entry(args->dnode, NULL, true);
holddown = yang_dnode_get_uint16(args->dnode, NULL); holddown = yang_dnode_get_uint16(args->dnode, NULL);
isis = circuit->area->isis;
if (circuit->ldp_sync_info == NULL) if (circuit->ldp_sync_info == NULL)
isis_ldp_sync_if_init(circuit, isis); isis_ldp_sync_if_init(circuit, isis);
assert(circuit->ldp_sync_info != NULL);
ldp_sync_info = circuit->ldp_sync_info; ldp_sync_info = circuit->ldp_sync_info;
SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_HOLDDOWN); SET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_HOLDDOWN);
@ -2868,22 +2903,27 @@ int lib_interface_isis_mpls_holddown_destroy(struct nb_cb_destroy_args *args)
{ {
struct isis_circuit *circuit; struct isis_circuit *circuit;
struct ldp_sync_info *ldp_sync_info; struct ldp_sync_info *ldp_sync_info;
struct isis *isis = isis_lookup_by_vrfid(VRF_DEFAULT); struct isis *isis;
switch (args->event) { switch (args->event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
if (isis == NULL) circuit = nb_running_get_entry(args->dnode, NULL, false);
return NB_ERR_VALIDATION; if (circuit == NULL || circuit->ldp_sync_info == NULL
circuit = nb_running_get_entry(args->dnode, NULL, true); || circuit->area == NULL)
if (circuit->ldp_sync_info == NULL)
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
if (circuit->area->isis->vrf_id != VRF_DEFAULT) {
snprintf(args->errmsg, args->errmsg_len,
"LDP-Sync only runs on Default VRF");
return NB_ERR_VALIDATION;
}
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
case NB_EV_ABORT: case NB_EV_ABORT:
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
circuit = nb_running_get_entry(args->dnode, NULL, true); circuit = nb_running_get_entry(args->dnode, NULL, true);
isis = circuit->area->isis;
ldp_sync_info = circuit->ldp_sync_info; ldp_sync_info = circuit->ldp_sync_info;
UNSET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_HOLDDOWN); UNSET_FLAG(ldp_sync_info->flags, LDP_SYNC_FLAG_HOLDDOWN);