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

Merge pull request #8865 from idryzhov/isis-fixes

Browse Source 
a couple of isis fixes
This commit is contained in:
Donald Sharp 2021-06-18 08:06:01 -04:00 committed by GitHub
commit 6e17b9cd7d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
isisd/isis_circuit.c
View File

@ -78,12 +78,14 @@ DEFINE_HOOK(isis_circuit_del_hook, (struct isis_circuit *circuit), (circuit));
static void isis_circuit_enable(struct isis_circuit *circuit) static void isis_circuit_enable(struct isis_circuit *circuit)
{ {
struct isis_area *area; struct isis_area *area = circuit->area;
struct interface *ifp = circuit->interface; struct interface *ifp = circuit->interface;
area = isis_area_lookup(circuit->tag, ifp->vrf_id); if (!area) {
if (area) area = isis_area_lookup(circuit->tag, ifp->vrf_id);
isis_area_add_circuit(area, circuit); if (area)
isis_area_add_circuit(area, circuit);
}
if (if_is_operative(ifp)) if (if_is_operative(ifp))
isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp); isis_csm_state_change(IF_UP_FROM_Z, circuit, ifp);

2
isisd/isisd.c
View File

@ -402,7 +402,7 @@ struct isis_area *isis_area_create(const char *area_tag, const char *vrf_name)
continue; continue;
circuit = ifp->info; circuit = ifp->info;
if (circuit) if (circuit && strmatch(circuit->tag, area->area_tag))
isis_area_add_circuit(area, circuit); isis_area_add_circuit(area, circuit);
} }
} }