/* LSA can be temporarrily, but body must be mb_alloced. */
struct top_hash_entry *
-lsa_install_new(struct ospf_lsa_header *lsa, void *body, struct ospf_area *oa)
+lsa_install_new(struct ospf_lsa_header *lsa, void *body, struct ospf_area *oa,
+ struct proto *p)
{
- int change=0,i;
+ int change=0;
+ unsigned i;
struct top_hash_entry *en;
if((en=ospf_hash_find_header(oa->gr,lsa))==NULL)
{
en=ospf_hash_get_header(oa->gr,lsa);
change=1;
- s_add_tail(&oa->lsal, SNODE en);
}
else
{
- if(en->lsa.options!=lsa->options) change=1;
- if((en->lsa.age==LSA_MAXAGE)||(lsa->age==LSA_MAXAGE)) change=1;
- if(en->lsa.length!=lsa->length) change=1;
+ if((en->lsa.length!=lsa->length)||(en->lsa.options!=lsa->options)||
+ ((en->lsa.age==LSA_MAXAGE)||(lsa->age==LSA_MAXAGE))) change=1;
else
{
u8 *k=en->lsa_body,*l=body;
- for(i=0;i<lsa->length;i++)
+ for(i=0;i<(lsa->length-sizeof(struct ospf_lsa_header));i++)
{
if(*(k+i)!=*(l+i))
{
break;
}
}
- s_rem_node(SNODE en);
- s_add_tail(&oa->lsal, SNODE en);
+ /* FIXME delete routes to stub networks! */
+ }
+ if(change) s_rem_node(SNODE en);
+ }
+
+ if(change)
+ {
+ 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;
+ en->lsa.length=lsa->length;
+ memcpy(&en->lsa,lsa,sizeof(struct ospf_lsa_header));
+ /* FIXME decide if route calcualtion must be done and how */
+ if(oa->rt!=NULL)
+ {
+ DBG("Starting routing table calculation.\n");
+ ospf_rt_spfa(oa, p);
}
}
- 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 calcualtion must be done and how */
return en;
}
ospf_neigh_sm(struct ospf_neighbor *n, int event)
/* Interface state machine */
{
- struct proto *p;
-
- p=(struct proto *)(n->ifa->proto);
+ struct proto *p=(struct proto *)(n->ifa->proto);
+ struct proto_ospf *po=n->ifa->proto;
DBG("%s: Neighbor state machine for neighbor %I, event \"%s\".\n",
p->name, n->rid, ospf_inm[event]);
}
break;
case INM_2WAYREC:
- if(n->state==NEIGHBOR_INIT)
+ if(n->state<NEIGHBOR_2WAY)
{
/* Can In build adjacency? */
neigh_chstate(n,NEIGHBOR_2WAY);
neigh_chstate(n,NEIGHBOR_EXSTART);
tryadj(n,p);
}
+ ospf_int_sm(n->ifa, ISM_NEICH);
}
break;
case INM_NEGDONE:
break;
case INM_LOADDONE:
neigh_chstate(n,NEIGHBOR_FULL);
+ originate_rt_lsa(n->ifa->oa,po);
break;
case INM_ADJOK:
switch(n->state)
case INM_LLDOWN:
case INM_INACTTIM:
neigh_chstate(n,NEIGHBOR_DOWN);
+ ospf_int_sm(n->ifa, ISM_NEICH);
break;
case INM_1WAYREC:
if(n->state>=NEIGHBOR_2WAY)
{
neigh_chstate(n,NEIGHBOR_DOWN);
+ ospf_int_sm(n->ifa, ISM_NEICH);
}
break;
default:
void
bdr_election(struct ospf_iface *ifa, struct proto *p)
{
- struct ospf_neighbor *neigh,*ndr,*nbdr,me;
+ struct ospf_neighbor *neigh,*ndr,*nbdr,me,*tmp;
u32 myid, ndrid, nbdrid;
int doadj;
doadj=0;
if((ifa->drid!=ndrid) || (ifa->bdrid!=nbdrid)) doadj=1;
ifa->drid=ndrid;
+ if((tmp=find_neigh(ifa,ndrid))==NULL) die("Error i BDR election.\n");
+ ifa->drip=tmp->ip;
ifa->bdrid=nbdrid;
+ if((tmp=find_neigh(ifa,nbdrid))==NULL) die("Error i BDR election.\n");
+ ifa->bdrip=tmp->ip;
DBG("%s: DR=%I, BDR=%I\n",p->name, ifa->drid, ifa->bdrid);
struct top_hash_entry *en, *nx;
u32 i,*rts;
struct ospf_lsa_rt *rt;
- struct ospf_lsa_rt_link *rtl;
- rta a0,*a;
+ struct ospf_lsa_rt_link *rtl,*rr;
/*
* First of all, mark all vertices as they are not in SPF
init_list(&oa->cand); /* Empty list of candidates */
oa->trcap=0;
+ DBG("LSA db prepared, adding me into candidate list.\n");
+
oa->rt->dist=0;
oa->rt->color=CANDIDATE;
- add_head(&oa->cand, &en->cn);
+ add_head(&oa->cand, &oa->rt->cn);
+ DBG("RT LSA: rt: %I, id: %I, type: %u\n",oa->rt->lsa.rt,oa->rt->lsa.id,oa->rt->lsa.type);
while(!EMPTY_LIST(oa->cand))
{
act=SKIP_BACK(struct top_hash_entry, cn, n);
rem_node(n);
+ DBG("Working on LSA: rt: %I, id: %I, type: %u\n",act->lsa.rt,act->lsa.id,act->lsa.type);
+
act->color=INSPF;
switch(act->lsa.type)
{
case LSA_T_RT:
rt=(struct ospf_lsa_rt *)act->lsa_body;
if((rt->VEB)&(1>>LSA_RT_V)) oa->trcap=1;
- rtl=(struct ospf_lsa_rt_link *)(rt+1);
- for(i=0;rt->links;i++)
+ rr=(struct ospf_lsa_rt_link *)(rt+1);
+ DBG(" Number of links: %u\n",rt->links);
+ for(i=0;i<rt->links;i++)
{
tmp=NULL;
- switch((rtl+i)->type)
+ rtl=(rr+i);
+ DBG(" Working on link: %I (type: %u) ",rtl->id,rtl->type);
+ switch(rtl->type)
{
case LSART_STUB:
case LSART_VLNK:
+ DBG("Ignoring\n");
continue;
break;
case LSART_NET:
- tmp=ospf_hash_find(oa->gr,rtl->data,rtl->id,LSA_T_RT);
+ /* 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");
break;
- case LSART_PTP:
- tmp=ospf_hash_find(oa->gr,rtl->data,rtl->id,LSA_T_NET);
+ case LSART_PTP: /* FIXME */
+ tmp=ospf_hash_find(oa->gr,rtl->id,rtl->id,LSA_T_RT);
+ DBG("PTP searched.\n");
break;
default:
log("Unknown link type in router lsa.\n");
break;
}
- add_cand(&oa->cand,tmp,act,act->dist+rtl->metric,p);
+ add_cand(&oa->cand,tmp,act,act->dist+rtl->metric,p,oa);
}
break;
case LSA_T_NET:
for(i=0;i<(act->lsa.length-sizeof(struct ospf_lsa_header)-
sizeof(struct ospf_lsa_net))/sizeof(u32);i++)
{
- tmp=ospf_hash_find(oa->gr, *rts, *rts, LSA_T_RT);
- add_cand(&oa->cand,tmp,act,act->dist,p);
+ DBG(" Working on router %I ",*(rts+i));
+ tmp=ospf_hash_find(oa->gr, *(rts+i), *(rts+i), LSA_T_RT);
+ if(tmp!=NULL) DBG("Found :-)\n");
+ else DBG("Fuck!\n");
+ add_cand(&oa->cand,tmp,act,act->dist,p,oa);
}
break;
}
if((act->lsa.type==LSA_T_NET)&&(act->nhi!=NULL))
{
net *ne;
+ rta a0;
rte *e;
ip_addr ip;
- struct ospf_lsa_net *ln=en->lsa_body;
+ struct ospf_lsa_net *ln=act->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; /* FIXME */
+ a0.dest=RTD_ROUTER;
a0.flags=0;
+ a0.aflags=0;
a0.iface=act->nhi;
a0.gw=act->nh;
- ip=ipa_from_u32(act->lsa.id);
-
-
+ 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=en->dist;
+ 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.from=act->lsa.rt;
}
-
-
-
-
+ else
+ {
+ if(act->lsa.type==LSA_T_NET)
+ {
+ struct ospf_lsa_net *ln=act->lsa_body;
+ DBG("NOT modifying rt entry %I mask %I\n",act->lsa.id,ln->netmask);
+ }
+ }
}
+ DBG("Now calculating routes for stub networks.\n");
+
/* Now calculate routes to stub networks */
WALK_SLIST_DELSAFE(SNODE en, SNODE nx, oa->lsal)
{
if(en->dist==LSINFINITY)
{
- s_rem_node(SNODE en);
+ /* 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);
+ //mb_free(en->lsa_body);
+ //ospf_hash_delete(oa->gr, en);
}
- if(en->lsa.type==LSA_T_NET)
+ if(en->lsa.type==LSA_T_RT)
{
+ 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;
- rtl=(struct ospf_lsa_rt_link *)(rt+1);
- for(i=0;rt->links;i++)
+ rr=(struct ospf_lsa_rt_link *)(rt+1);
+ for(i=0;i<rt->links;i++)
{
- if((rtl+i)->type==LSART_STUB)
+ rtl=rr+i;
+ if(rtl->type==LSART_STUB)
{
+ DBG(" Working on stub network: %I\n",rtl->id);
/* Check destination and so on (pg 166) */
}
}
void
add_cand(list *l, struct top_hash_entry *en, struct top_hash_entry *par,
- u16 dist, struct proto *p)
+ u16 dist, struct proto *p, struct ospf_area *oa)
{
node *prev,*n;
- int flag=0;
+ int flag=0,added=0;
struct top_hash_entry *act;
if(en==NULL) return;
* FIXME The line above is not a bug, but we don't support
* multiple next hops. I'll start as soon as nest will
*/
+ DBG(" Adding candidate: rt: %I, id: %I, type: %u\n",en->lsa.rt,en->lsa.id,en->lsa.type);
en->nhi=NULL;
- calc_next_hop(par,en,p);
+ calc_next_hop(par,en,p,oa);
- if(en->color==CANDIDATE) /* We found shorter path */
+ if(en->color==CANDIDATE) /* We found a shorter path */
{
rem_node(&en->cn);
}
prev=NULL;
- WALK_LIST(n,*l)
+ if(EMPTY_LIST(*l))
{
- act=SKIP_BACK(struct top_hash_entry, cn, n);
- if((act->dist>dist)||
- ((act->dist==dist)&&(act->lsa.type==LSA_T_NET)))
+ add_head(l,&en->cn);
+ }
+ else
+ {
+ WALK_LIST(n,*l)
{
- if(prev==NULL) add_head(l,&en->cn);
- else insert_node(&en->cn,prev);
- break;
+ act=SKIP_BACK(struct top_hash_entry, cn, n);
+ if((act->dist>dist)||
+ ((act->dist==dist)&&(act->lsa.type==LSA_T_NET)))
+ {
+ if(prev==NULL) add_head(l,&en->cn);
+ else insert_node(&en->cn,prev);
+ added=1;
+ break;
+ }
+ prev=n;
+ }
+
+ if(!added)
+ {
+ add_tail(l,&en->cn);
}
- prev=n;
}
/* FIXME Some VLINK staff should be here */
-
}
void
calc_next_hop(struct top_hash_entry *par, struct top_hash_entry *en,
- struct proto *p)
+ struct proto *p, struct ospf_area *oa)
{
struct ospf_neighbor *neigh;
struct proto_ospf *po=(struct proto_ospf *)p;
+ DBG(" Next hop called\n");
+ if(par==oa->rt) return;
if(par->nhi==NULL)
{
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) bug("XXX\n");
+ 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);
}
ifa->oa=oa;
oa->rt=originate_rt_lsa(oa,po);
+ DBG("RT LSA: rt: %I, id: %I, type: %u\n",oa->rt->lsa.rt,oa->rt->lsa.id,oa->rt->lsa.type);
flood_lsa(NULL,NULL,&oa->rt->lsa,po,NULL,oa);
}
struct top_hash_entry *en;
void *body;
- DBG("%s: Originating RT_lsa for area \"%d\".\n", po->proto.name, oa->areaid);
+ DBG("%s: Originating RT_lsa for area \"%I\".\n", po->proto.name, oa->areaid);
lsa.age=0;
lsa.id=rtid;
}
body=originate_rt_lsa_body(oa, &lsa.length, po);
lsasum_calculate(&lsa,body,po);
- en=lsa_install_new(&lsa, body, oa);
+ en=lsa_install_new(&lsa, body, oa, &po->proto);
return en;
}
static inline unsigned
ospf_top_hash(struct top_graph *f, u32 lsaid, u32 rtrid, u32 type)
{
+#if 1 /* Dirty patch to make rt table calculation work. */
+ return (ospf_top_hash_u32(lsaid) + ospf_top_hash_u32((type==2) ? lsaid : rtrid) + type) & f->hash_mask;
+#else
return (ospf_top_hash_u32(lsaid) + ospf_top_hash_u32(rtrid) + type) & f->hash_mask;
+#endif
}
struct top_graph *
{
struct top_hash_entry *e = f->hash_table[ospf_top_hash(f, lsa, rtr, type)];
+#if 1
+ if(type==2 && lsa==rtr)
+ {
+ while (e && (e->lsa.id != lsa || e->lsa.type != 2 ))
+ e = e->next;
+ }
+ else
+ {
+ while (e && (e->lsa.id != lsa || e->lsa.type != type || e->lsa.rt != rtr))
+ e = e->next;
+ }
+#else
while (e && (e->lsa.id != lsa || e->lsa.rt != rtr || e->lsa.type != type))
e = e->next;
+#endif
return e;
}
struct top_hash_entry *e = f->hash_table[i];
while (e)
{
- debug("\t%04x %08x %08x %p\n", e->lsa.type, e->lsa.id,
+ debug("\t%04x %08I %08I %p\n", e->lsa.type, e->lsa.id,
e->lsa.rt, e->lsa_body);
e = e->next;
}
projects / thirdparty / bird.git / commitdiff
