Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OSPF: Reset LSAs during area type change

Browse source 
When area is reconfigured to a different type, we need to flush LSAs as
they may not be valid (e.g. NSSA-LSA for non-NSSA area). Also, when we
have have just one OSPF area and that changes type, we could restart OSPF
as there is no state to keep anyway. That solves issue with different
handling of external routes exported to OSPF based of main area type.
This commit is contained in:
Ondrej Zajicek (work) 2019-02-17 01:54:01 +01:00
parent 4a3f5b3617
commit bf8d7bba9e
1 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
proto/ospf/ospf.c
View file

@ -599,17 +599,25 @@ ospf_area_reconfigure(struct ospf_area *oa, struct ospf_area_config *nac)
{ {
struct ospf_proto *p = oa->po; struct ospf_proto *p = oa->po;
struct ospf_area_config *oac = oa->ac; struct ospf_area_config *oac = oa->ac;
struct ospf_iface *ifa; struct ospf_iface *ifa, *ifx;
oa->ac = nac; oa->ac = nac;
oa->options = nac->type | ospf_opts(p); oa->options = nac->type | ospf_opts(p);
if (nac->type != oac->type) if (nac->type != oac->type)
{ {
/* Force restart of area interfaces */ log(L_INFO "%s: Restarting area %R", p->p.name, oa->areaid);
WALK_LIST(ifa, p->iface_list)
/* Remove area interfaces, will be re-added later */
WALK_LIST_DELSAFE(ifa, ifx, p->iface_list)
if (ifa->oa == oa) if (ifa->oa == oa)
ifa->marked = 2; {
ospf_iface_shutdown(ifa);
ospf_iface_remove(ifa);
}
/* Flush area LSAs */
ospf_flush_area(p, oa->areaid);
} }
/* Handle net_list */ /* Handle net_list */
@ -639,7 +647,7 @@ ospf_reconfigure(struct proto *P, struct proto_config *CF)
struct ospf_proto *p = (struct ospf_proto *) P; struct ospf_proto *p = (struct ospf_proto *) P;
struct ospf_config *old = (struct ospf_config *) (P->cf); struct ospf_config *old = (struct ospf_config *) (P->cf);
struct ospf_config *new = (struct ospf_config *) CF; struct ospf_config *new = (struct ospf_config *) CF;
struct ospf_area_config *nac; struct ospf_area_config *oac, *nac;
struct ospf_area *oa, *oax; struct ospf_area *oa, *oax;
struct ospf_iface *ifa, *ifx; struct ospf_iface *ifa, *ifx;
struct ospf_iface_patt *ip; struct ospf_iface_patt *ip;
@ -659,6 +667,15 @@ ospf_reconfigure(struct proto *P, struct proto_config *CF)
if (old->abr != new->abr) if (old->abr != new->abr)
return 0; return 0;
if (p->areano == 1)
{
oac = HEAD(old->area_list);
nac = HEAD(new->area_list);
if (oac->type != nac->type)
return 0;
}
if (old->vpn_pe != new->vpn_pe) if (old->vpn_pe != new->vpn_pe)
return 0; return 0;
@ -674,7 +691,7 @@ ospf_reconfigure(struct proto *P, struct proto_config *CF)
p->ecmp = new->ecmp; p->ecmp = new->ecmp;
p->tick = new->tick; p->tick = new->tick;
p->disp_timer->recurrent = p->tick S; p->disp_timer->recurrent = p->tick S;
tm_start(p->disp_timer, 100 MS); tm_start(p->disp_timer, 10 MS);
/* Mark all areas and ifaces */ /* Mark all areas and ifaces */
WALK_LIST(oa, p->area_list) WALK_LIST(oa, p->area_list)