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

isisd: fix point-to-point network type config

Browse Source 
`isis network point-to-point` was being rejected from the configuration
file as it was being processed before the reception of the UP zebra
notification for the interface. This meant that the `circ_type` was set
at CIRCUIT_T_UNKNOWN, which led the northbound callback to fail. This
check was removed as it was not really necessary; when the zebra
notification is received, the correct circuit type will be enforced,
but now the point-to-point config will be saved and correctly applied
when zebra recognizes the interface as a broadcast one.

Signed-off-by: Emanuele Di Pascale <emanuele@voltanet.io>
This commit is contained in:
Emanuele Di Pascale 2019-01-07 12:29:29 +01:00
parent e4587bc559
commit 2e29ab9cce
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
isisd/isis_northbound.c
View File

@ -1982,11 +1982,10 @@ static int lib_interface_isis_network_type_modify(enum nb_event event,
circuit = yang_dnode_get_entry(dnode, false); circuit = yang_dnode_get_entry(dnode, false);
if (!circuit) if (!circuit)
break; break;
if (circuit->circ_type == CIRCUIT_T_LOOPBACK if (circuit->circ_type == CIRCUIT_T_LOOPBACK) {
|| circuit->circ_type == CIRCUIT_T_UNKNOWN) {
flog_warn( flog_warn(
EC_LIB_NB_CB_CONFIG_VALIDATE, EC_LIB_NB_CB_CONFIG_VALIDATE,
"Cannot change network type on unknown or loopback interface"); "Cannot change network type on loopback interface");
return NB_ERR_VALIDATION; return NB_ERR_VALIDATION;
} }
if (net_type == CIRCUIT_T_BROADCAST if (net_type == CIRCUIT_T_BROADCAST