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

Merge pull request #4917 from manuhalo/fix_isis_circuit_del

Browse Source 
isisd: fix northbound circuit deletion
This commit is contained in:
Donald Sharp 2019-09-03 08:09:00 -04:00 committed by GitHub
commit 39fbea23a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
isisd/isis_northbound.c
View File

@ -1561,21 +1561,8 @@ static int lib_interface_isis_destroy(enum nb_event event,
circuit = nb_running_unset_entry(dnode); circuit = nb_running_unset_entry(dnode);
if (!circuit) if (!circuit)
return NB_ERR_INCONSISTENCY; return NB_ERR_INCONSISTENCY;
/* delete circuit through csm changes */ if (circuit->state == C_STATE_UP || circuit->state == C_STATE_CONF)
switch (circuit->state) {
case C_STATE_UP:
isis_csm_state_change(IF_DOWN_FROM_Z, circuit,
circuit->interface);
isis_csm_state_change(ISIS_DISABLE, circuit, circuit->area); isis_csm_state_change(ISIS_DISABLE, circuit, circuit->area);
break;
case C_STATE_CONF:
isis_csm_state_change(ISIS_DISABLE, circuit, circuit->area);
break;
case C_STATE_INIT:
isis_csm_state_change(IF_DOWN_FROM_Z, circuit,
circuit->interface);
break;
}
return NB_OK; return NB_OK;
} }