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

Install newer lsa even if nothing in its body change.

Browse source
This commit is contained in:
Ondrej Filip 2000-06-04 19:21:23 +00:00
parent 67cc9135bf
commit dab6651916
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
proto/ospf/lsalib.c
View file

@ -39,9 +39,13 @@ ospf_age(struct ospf_area *oa)
lsasum_calculate(&en->lsa,en->lsa_body,po); lsasum_calculate(&en->lsa,en->lsa_body,po);
return; return;
} }
if((en->lsa.age+=delta)>LSA_MAXAGE) if((en->lsa.age+=delta)>=LSA_MAXAGE)
{ {
if(flush) flush_lsa(en,oa); if(flush)
{
flush_lsa(en,oa);
schedule_rtcalc(oa);
}
else en->lsa.age=LSA_MAXAGE; else en->lsa.age=LSA_MAXAGE;
} }
} }
@ -364,6 +368,7 @@ lsa_comp(struct ospf_lsa_header *l1, struct ospf_lsa_header *l2)
if((l1->age==LSA_MAXAGE)&&(l2->age!=LSA_MAXAGE)) return CMP_NEWER; if((l1->age==LSA_MAXAGE)&&(l2->age!=LSA_MAXAGE)) return CMP_NEWER;
if((l2->age==LSA_MAXAGE)&&(l1->age!=LSA_MAXAGE)) return CMP_OLDER; if((l2->age==LSA_MAXAGE)&&(l1->age!=LSA_MAXAGE)) return CMP_OLDER;
debug("Abs=%u\n",abs(l1->age-l2->age));
if(abs(l1->age-l2->age)>LSA_MAXAGEDIFF) if(abs(l1->age-l2->age)>LSA_MAXAGEDIFF)
return l1->age<l2->age ? CMP_NEWER : CMP_OLDER; return l1->age<l2->age ? CMP_NEWER : CMP_OLDER;
@ -379,6 +384,8 @@ lsa_install_new(struct ospf_lsa_header *lsa, void *body, struct ospf_area *oa,
unsigned i; unsigned i;
struct top_hash_entry *en; struct top_hash_entry *en;
if(body==NULL) die("AA");
if((en=ospf_hash_find_header(oa->gr,lsa))==NULL) if((en=ospf_hash_find_header(oa->gr,lsa))==NULL)
{ {
en=ospf_hash_get_header(oa->gr,lsa); en=ospf_hash_get_header(oa->gr,lsa);
@ -403,18 +410,15 @@ lsa_install_new(struct ospf_lsa_header *lsa, void *body, struct ospf_area *oa,
if(change) s_rem_node(SNODE en); if(change) s_rem_node(SNODE en);
} }
s_add_tail(&oa->lsal, SNODE en);
en->inst_t=now;
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
en->lsa_body=body;
memcpy(&en->lsa,lsa,sizeof(struct ospf_lsa_header));
if(change) if(change)
{ {
s_add_tail(&oa->lsal, SNODE en); schedule_rtcalc(oa);
en->inst_t=now;
if(en->lsa_body!=NULL) mb_free(en->lsa_body);
en->lsa_body=body;
memcpy(&en->lsa,lsa,sizeof(struct ospf_lsa_header));
/* FIXME decide if route calculation must be done and how */
if(oa->rt!=NULL)
{
schedule_rtcalc(oa);
}
} }
return en; return en;