From d345cda5a1cea03a09e5a37c999e88c5177c8a9e Mon Sep 17 00:00:00 2001 From: Ondrej Filip Date: Thu, 4 May 2000 01:23:03 +0000 Subject: [PATCH] Bugfix in Network lsa originating Bugfix in ntohlsab() and htonlsab() For calculating of rt I use my own fib. I delete routes! ;-) --- proto/ospf/lsalib.c | 4 +- proto/ospf/lsupd.c | 6 +- proto/ospf/neighbor.c | 4 +- proto/ospf/ospf.h | 3 +- proto/ospf/rt.c | 236 +++++++++++++++++------------------------- proto/ospf/rt.h | 8 +- proto/ospf/topology.c | 17 ++- 7 files changed, 123 insertions(+), 155 deletions(-) diff --git a/proto/ospf/lsalib.c b/proto/ospf/lsalib.c index 4c416777..4bb0635b 100644 --- a/proto/ospf/lsalib.c +++ b/proto/ospf/lsalib.c @@ -267,12 +267,12 @@ lsasum_calculate(struct ospf_lsa_header *h,void *body,struct proto_ospf *po) length=h->length; htonlsah(h,h); - htonlsab(body,body,h->type,length); + htonlsab(body,body,h->type,length-sizeof(struct ospf_lsa_header)); (void)lsasum_check(h,body,po); ntohlsah(h,h); - ntohlsab(body,body,h->type,length); + ntohlsab(body,body,h->type,length-sizeof(struct ospf_lsa_header)); } /* diff --git a/proto/ospf/lsupd.c b/proto/ospf/lsupd.c index b372a219..b405a664 100644 --- a/proto/ospf/lsupd.c +++ b/proto/ospf/lsupd.c @@ -116,7 +116,8 @@ flood_lsa(struct ospf_neighbor *n, struct ospf_lsa_header *hn, lh->age=htons(age); help=(u8 *)(lh+1); en=ospf_hash_find_header(oa->gr,hh); - htonlsab(en->lsa_body,help,hh->type,hh->length); + htonlsab(en->lsa_body,help,hh->type,hh->length + -sizeof(struct ospf_lsa_header)); len=hh->length; } op->length=htons(len); @@ -186,7 +187,8 @@ ospf_lsupd_tx_list(struct ospf_neighbor *n, list *l) } htonlsah(&(en->lsa), pktpos); pktpos=pktpos+sizeof(struct ospf_lsa_header); - htonlsab(en->lsa_body, pktpos, en->lsa.type, en->lsa.length); + htonlsab(en->lsa_body, pktpos, en->lsa.type, en->lsa.length + -sizeof(struct ospf_lsa_header)); pktpos=pktpos+en->lsa.length-sizeof(struct ospf_lsa_header); len=len+en->lsa.length; lsano++; diff --git a/proto/ospf/neighbor.c b/proto/ospf/neighbor.c index 050a253d..831cd621 100644 --- a/proto/ospf/neighbor.c +++ b/proto/ospf/neighbor.c @@ -27,7 +27,7 @@ neigh_chstate(struct ospf_neighbor *n, u8 state) ifa=n->ifa; if(n->state==NEIGHBOR_FULL) { - ifa->fadj++; + ifa->fadj--; n->state=state; originate_rt_lsa(ifa->oa,ifa->oa->po); originate_net_lsa(ifa,ifa->oa->po); @@ -39,7 +39,7 @@ neigh_chstate(struct ospf_neighbor *n, u8 state) n->state=state; if(state==NEIGHBOR_FULL) { - ifa->fadj--; + ifa->fadj++; originate_rt_lsa(n->ifa->oa,n->ifa->oa->po); originate_net_lsa(ifa,ifa->oa->po); } diff --git a/proto/ospf/ospf.h b/proto/ospf/ospf.h index 22064b96..f2736c61 100644 --- a/proto/ospf/ospf.h +++ b/proto/ospf/ospf.h @@ -26,7 +26,7 @@ #include "nest/iface.h" #include "nest/route.h" #include "conf/conf.h" -#include +#include "lib/string.h" #define OSPF_PROTO 89 #ifndef IPV6 @@ -334,6 +334,7 @@ struct ospf_area { u8 stub; u8 trcap; /* Transit capability? */ struct proto_ospf *po; + struct fib infib; /* FIB for intra-area routes */ }; struct proto_ospf { diff --git a/proto/ospf/rt.c b/proto/ospf/rt.c index 4625df6b..19503428 100644 --- a/proto/ospf/rt.c +++ b/proto/ospf/rt.c @@ -9,12 +9,12 @@ #include "ospf.h" void -init_stub_fib(struct fib_node *fn) +init_infib(struct fib_node *fn) { - struct stub_fib *sf=(struct stub_fib *)fn; + struct infib *f=(struct infib *)fn; - sf->metric=LSINFINITY; - sf->nhi=NULL; + f->metric=LSINFINITY; + f->en=NULL; } void @@ -24,13 +24,17 @@ ospf_rt_spfa(struct ospf_area *oa) u32 i,*rts; struct ospf_lsa_rt *rt; struct ospf_lsa_rt_link *rtl,*rr; - struct fib fib; - struct stub_fib *sf; + struct fib *in=&oa->infib; + struct infib *nf; bird_clock_t delta; int age=0,flush=0; struct proto *p=&oa->po->proto; + ip_addr ip; + struct fib_iterator fit; + struct ospf_lsa_net *ln; flush=can_flush_lsa(oa); + if((delta=now-oa->lage)>=AGINGDELTA) { oa->lage=now; @@ -44,6 +48,13 @@ ospf_rt_spfa(struct ospf_area *oa) if(age) ospf_age(en,delta,flush,oa); } + FIB_WALK(in,nftmp) + { + nf=(struct infib *)nftmp; + nf->metric=LSINFINITY; + } + FIB_WALK_END; + init_list(&oa->cand); /* Empty list of candidates */ oa->trcap=0; @@ -58,7 +69,7 @@ ospf_rt_spfa(struct ospf_area *oa) { struct top_hash_entry *act,*tmp; node *n; - struct ospf_lsa_net *netw; + u16 met; n=HEAD(oa->cand); act=SKIP_BACK(struct top_hash_entry, cn, n); @@ -81,13 +92,21 @@ ospf_rt_spfa(struct ospf_area *oa) DBG(" Working on link: %I (type: %u) ",rtl->id,rtl->type); switch(rtl->type) { - case LSART_STUB: + case LSART_STUB: /* FIXME add stub network into fib */ + DBG("\n"); + ip=ipa_from_u32(rtl->id); + nf=fib_get(in,&ip, ipa_mklen(ipa_from_u32(rtl->data))); + if(nf->metric>(met=act->dist+rtl->metric)) + { + nf->metric=met; + nf->en=act; + } + break; case LSART_VLNK: DBG("Ignoring\n"); continue; break; case LSART_NET: - /* FIXME Oh shit so bad complication */ tmp=ospf_hash_find(oa->gr,rtl->id,rtl->id,LSA_T_NET); if(tmp==NULL) DBG("Fuck!\n"); else DBG("Found. :-)\n"); @@ -103,9 +122,17 @@ ospf_rt_spfa(struct ospf_area *oa) add_cand(&oa->cand,tmp,act,act->dist+rtl->metric,oa); } break; - case LSA_T_NET: - netw=(struct ospf_lsa_net *)act->lsa_body; - rts=(u32 *)(netw+1); + case LSA_T_NET: /* FIXME Add to fib */ + ln=act->lsa_body; + ip=ipa_and(ipa_from_u32(act->lsa.id),ln->netmask); + nf=fib_get(in,&ip, ipa_mklen(ln->netmask)); + if(nf->metric>act->dist) + { + nf->metric=act->dist; + nf->en=act; + } + + rts=(u32 *)(ln+1); for(i=0;i<(act->lsa.length-sizeof(struct ospf_lsa_header)- sizeof(struct ospf_lsa_net))/sizeof(u32);i++) { @@ -117,17 +144,23 @@ ospf_rt_spfa(struct ospf_area *oa) } break; } - /* FIXME Now modify rt for this entry */ - if((act->lsa.type==LSA_T_NET)&&(act->nhi!=NULL)) + } + /* Now sync our fib with nest's */ + DBG("\nNow syncing my rt table with nest's\n\n"); + FIB_ITERATE_INIT(&fit,in); +again: + FIB_ITERATE_START(in,&fit,nftmp) + { + nf=(struct infib *)nftmp; + if(nf->metric==LSINFINITY) { net *ne; rta a0; - rte *e; - ip_addr ip; - struct ospf_lsa_net *ln=act->lsa_body; - + struct top_hash_entry *en=nf->en; + ln=en->lsa_body; + bzero(&a0, sizeof(a0)); - + a0.proto=p; a0.source=RTS_OSPF; a0.scope=SCOPE_UNIVERSE; /* What's this good for? */ @@ -135,108 +168,58 @@ ospf_rt_spfa(struct ospf_area *oa) a0.dest=RTD_ROUTER; a0.flags=0; a0.aflags=0; - a0.iface=act->nhi; - a0.gw=act->nh; - a0.from=act->nh; /* FIXME Just a test */ - ip=ipa_and(ipa_from_u32(act->lsa.id),ln->netmask); - ne=net_get(p->table, ip, ipa_mklen(ln->netmask)); - e=rte_get_temp(&a0); - e->u.ospf.metric1=act->dist; - e->u.ospf.metric2=0; - e->u.ospf.tag=0; /* FIXME Some config? */ - e->pflags = 0; - e->net=ne; - DBG("Modifying rt entry %I mask %I\n (IP: %I, GW: %I, Iface: %s)\n", - act->lsa.id,ln->netmask,ip,act->nh,act->nhi->name); - rte_update(p->table, ne, p, e); + a0.iface=en->nhi; + a0.gw=en->nh; + a0.from=en->nh; /* FIXME Just a test */ + ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen); + DBG("Deleting rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n", + nf->fn.prefix,ip,en->nh,en->nhi->name); + rte_update(p->table, ne, p, NULL); + + /* Now delete my fib */ + FIB_ITERATE_PUT(&fit, nftmp); + fib_delete(in, nftmp); + goto again; } else { - if(act->lsa.type==LSA_T_NET) + /* Update routing table */ + if(nf->en->nhi!=NULL) { - struct ospf_lsa_net *ln=act->lsa_body; - DBG("NOT modifying rt entry %I mask %I\n",act->lsa.id,ln->netmask); + net *ne; + rta a0; + rte *e; + struct top_hash_entry *en=nf->en; + ln=en->lsa_body; + + bzero(&a0, sizeof(a0)); + + a0.proto=p; + a0.source=RTS_OSPF; + a0.scope=SCOPE_UNIVERSE; /* What's this good for? */ + a0.cast=RTC_UNICAST; + a0.dest=RTD_ROUTER; + a0.flags=0; + a0.aflags=0; + a0.iface=en->nhi; + a0.gw=en->nh; + a0.from=en->nh; /* FIXME Just a test */ + ne=net_get(p->table, nf->fn.prefix, nf->fn.pxlen); + e=rte_get_temp(&a0); + e->u.ospf.metric1=nf->metric; + e->u.ospf.metric2=0; + e->u.ospf.tag=0; /* FIXME Some config? */ + e->pflags = 0; + e->net=ne; + DBG("Modifying rt entry %I\n (IP: %I, GW: %I, Iface: %s)\n", + nf->fn.prefix,ip,en->nh,en->nhi->name); + rte_update(p->table, ne, p, e); } } + } + FIB_ITERATE_END(nftmp); - DBG("Now calculating routes for stub networks.\n"); - - /* Now calculate routes to stub networks */ - fib_init(&fib,p->pool,sizeof(struct stub_fib),16,init_stub_fib); - /*FIXME 16? */ - - WALK_SLIST_DELSAFE(SNODE en, SNODE nx, oa->lsal) - { - if((en->lsa.type==LSA_T_RT)||(en->lsa.type==LSA_T_NET)) - { - if(en->dist==LSINFINITY) - { - /* FIXME I cannot remove node If I'm not FULL states */ - //s_rem_node(SNODE en); - /* FIXME Remove from routing table! */ - //mb_free(en->lsa_body); - //ospf_hash_delete(oa->gr, en); - } - if(en->lsa.type==LSA_T_RT) - { - ip_addr ip; - - DBG("Working on LSA: rt: %I, id: %I, type: %u\n",en->lsa.rt,en->lsa.id,en->lsa.type); - rt=(struct ospf_lsa_rt *)en->lsa_body; - if((rt->VEB)&(1>>LSA_RT_V)) oa->trcap=1; - rr=(struct ospf_lsa_rt_link *)(rt+1); - for(i=0;ilinks;i++) - { - rtl=rr+i; - if(rtl->type==LSART_STUB) - { - DBG(" Working on stub network: %I\n",rtl->id); - ip=ipa_from_u32(rtl->id); - /* Check destination and so on (pg 166) */ - sf=fib_get(&fib,&ip, - ipa_mklen(ipa_from_u32(rtl->data))); - - if(sf->metric>(en->dist+rtl->metric)) - { - sf->metric=en->dist+rtl->metric; - calc_next_hop_fib(en,sf,oa); - if(sf->nhi!=NULL) - { - net *ne; - rta a0; - rte *e; - - bzero(&a0, sizeof(a0)); - - a0.proto=p; - a0.source=RTS_OSPF; - a0.scope=SCOPE_UNIVERSE; /* What's this good for? */ - a0.cast=RTC_UNICAST; - a0.dest=RTD_ROUTER; - a0.flags=0; - a0.aflags=0; - a0.iface=sf->nhi; - a0.gw=sf->nh; - a0.from=sf->nh; /* FIXME Just a test */ - ip=ipa_from_u32(rtl->id); - ne=net_get(p->table, ip, ipa_mklen(ipa_from_u32(rtl->data))); - e=rte_get_temp(&a0); - e->u.ospf.metric1=sf->metric; - e->u.ospf.metric2=0; - e->u.ospf.tag=0; /* FIXME Some config? */ - e->pflags = 0; - e->net=ne; - DBG("Modifying stub rt entry %I mask %I\n (GW: %I, Iface: %s)\n", - ip,rtl->data,sf->nh,sf->nhi->name); - rte_update(p->table, ne, p, e); - } - } - } - } - } - } - } } void @@ -316,32 +299,6 @@ calc_next_hop(struct top_hash_entry *par, struct top_hash_entry *en, neighbor *nn; DBG(" Next hop calculating for id: %I rt: %I type: %u\n",en->lsa.id,en->lsa.rt,en->lsa.type); if(par->lsa.type!=LSA_T_RT) return; - if((neigh=find_neigh_noifa(po,en->lsa.rt))==NULL) return; - nn=neigh_find(p,&neigh->ip,0); - DBG(" Next hop calculated: %I\n", nn->addr); - en->nh=nn->addr; - en->nhi=nn->iface; - return; - } - en->nh=par->nh; - en->nhi=par->nhi; - DBG(" Next hop calculated: %I\n", en->nh); -} - -void -calc_next_hop_fib(struct top_hash_entry *par, struct stub_fib *en, - struct ospf_area *oa) -{ - struct ospf_neighbor *neigh; - struct proto *p=&oa->po->proto; - struct proto_ospf *po=oa->po; - DBG(" Next hop called\n"); - if(par==oa->rt) return; - if(par->nhi==NULL) - { - neighbor *nn; - DBG(" Next hop calculating for Fib\n"); - if(par->lsa.type!=LSA_T_RT) return; if((neigh=find_neigh_noifa(po,par->lsa.rt))==NULL) return; nn=neigh_find(p,&neigh->ip,0); DBG(" Next hop calculated: %I\n", nn->addr); @@ -353,3 +310,4 @@ calc_next_hop_fib(struct top_hash_entry *par, struct stub_fib *en, en->nhi=par->nhi; DBG(" Next hop calculated: %I\n", en->nh); } + diff --git a/proto/ospf/rt.h b/proto/ospf/rt.h index 7fe482f7..da2f0381 100644 --- a/proto/ospf/rt.h +++ b/proto/ospf/rt.h @@ -10,12 +10,11 @@ #ifndef _BIRD_OSPF_RT_H_ #define _BIRD_OSPF_RT_H_ -struct stub_fib { +struct infib { struct fib_node fn; u16 metric; u16 pad; - ip_addr nh; - struct iface *nhi; + struct top_hash_entry *en; }; void ospf_rt_spfa(struct ospf_area *oa); @@ -23,7 +22,6 @@ void add_cand(list *l, struct top_hash_entry *en, struct top_hash_entry *par, u16 dist, struct ospf_area *oa); void calc_next_hop(struct top_hash_entry *par, struct top_hash_entry *en, struct ospf_area *oa); -void calc_next_hop_fib(struct top_hash_entry *par, struct stub_fib *en, - struct ospf_area *oa); +void init_infib(struct fib_node *fn); #endif /* _BIRD_OSPF_RT_H_ */ diff --git a/proto/ospf/topology.c b/proto/ospf/topology.c index 22f463c3..4a41e323 100644 --- a/proto/ospf/topology.c +++ b/proto/ospf/topology.c @@ -118,7 +118,7 @@ originate_rt_lsa_body(struct ospf_area *oa, u16 *length, struct proto_ospf *p) (neigh->state==NEIGHBOR_FULL)) k=1; if(neigh->state==NEIGHBOR_FULL) j=1; } - if(((ifa->state=OSPF_IS_DR) && (j==1)) || (k==1)) + if(((ifa->state==OSPF_IS_DR) && (j==1)) || (k==1)) { ln->type=LSART_NET; ln->id=ipa_to_u32(ifa->drip); @@ -205,6 +205,8 @@ addifa_rtlsa(struct ospf_iface *ifa) oa->age_timer->hook=age_timer_hook; oa->age_timer->recurrent=AGINGDELTA; tm_start(oa->age_timer,AGINGDELTA); + fib_init(&oa->infib,po->proto.pool,sizeof(struct infib),16,init_infib); + /* FIXME 16?? (Oh, sweet 16.... :-) */ po->areano++; DBG("%s: New OSPF area \"%d\" added.\n", po->proto.name, ifa->an); } @@ -252,8 +254,13 @@ originate_net_lsa_body(struct ospf_iface *ifa, u16 *length, u16 i=1; struct ospf_neighbor *n; u32 *body; + struct ospf_lsa_net *net; - body=mb_alloc(po->proto.pool,sizeof(u32)*ifa->fadj); + net=mb_alloc(po->proto.pool,sizeof(u32)*(ifa->fadj+1)+ + sizeof(struct ospf_lsa_net)); + net->netmask=ipa_mkmask(ifa->iface->addr->pxlen); + + body=(u32 *)(net+1); i=1; *body=po->proto.cf->global->router_id; WALK_LIST(n,ifa->neigh_list) @@ -264,8 +271,9 @@ originate_net_lsa_body(struct ospf_iface *ifa, u16 *length, i++; } } - *length=i*sizeof(u32)+sizeof(struct ospf_lsa_header); - return body; + *length=i*sizeof(u32)+sizeof(struct ospf_lsa_header)+ + sizeof(struct ospf_lsa_net); + return net; } void @@ -277,6 +285,7 @@ originate_net_lsa(struct ospf_iface *ifa, struct proto_ospf *po) void *body; DBG("%s: Originating Net lsa for iface \"%s\".\n", po->proto.name, ifa->iface->name); + DBG("%s: State is:\"%u\" Fadj=%u.\n", po->proto.name, ifa->state,ifa->fadj); if(ifa->state!=OSPF_IS_DR) return;