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

Slave bug fix.

Browse source
This commit is contained in:
Ondrej Filip 2000-03-29 17:51:40 +00:00
parent 910e557b47
commit 2560c8860e
1 changed files with 35 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
proto/ospf/dbdes.c
View file

@ -89,37 +89,36 @@ ospf_dbdes_tx(struct ospf_neighbor *n)
if(n->myimms.bit.m) if(n->myimms.bit.m)
{ {
sn=s_get(&(n->dbsi));
sn=s_get(&(n->dbsi)); DBG("Number of LSA: %d\n", j);
for(;i>0;i--)
{
struct top_hash_entry *en;
DBG("Number of LSA: %d\n", j); en=(struct top_hash_entry *)sn;
for(;i>0;i--) htonlsah(&(en->lsa), lsa);
{ DBG("Working on: %d\n", i);
struct top_hash_entry *en; debug("\t%04x %08x %08x %p\n", en->lsa.type, en->lsa.id,
en->lsa.rt, en->lsa_body);
en=(struct top_hash_entry *)sn; if(sn->next==NULL)
htonlsah(&(en->lsa), lsa); {
DBG("Working on: %d\n", i); break; /* Should set some flag? */
debug("\t%04x %08x %08x %p\n", en->lsa.type, en->lsa.id, }
en->lsa.rt, en->lsa_body); sn=sn->next;
lsa++;
}
i--;
if(sn->next==NULL) if(sn->next==NULL)
{ {
break; /* Should set some flag? */ DBG("Number of LSA NOT sent: %d\n", i);
DBG("M bit unset.\n");
n->myimms.bit.m=0; /* Unset more bit */
} }
sn=sn->next;
lsa++;
}
i--;
if(sn->next==NULL) s_put(&(n->dbsi),sn);
{
DBG("Number of LSA NOT sent: %d\n", i);
DBG("M bit unset.\n");
n->myimms.bit.m=0; /* Unset more bit */
}
s_put(&(n->dbsi),sn);
} }
pkt->imms.byte=n->myimms.byte; pkt->imms.byte=n->myimms.byte;
@ -185,10 +184,14 @@ rxmt_timer_hook(timer *timer)
n=(struct ospf_neighbor *)timer->data; n=(struct ospf_neighbor *)timer->data;
ifa=n->ifa; ifa=n->ifa;
p=(struct proto *)(ifa->proto); p=(struct proto *)(ifa->proto);
debug("%s: RXMT timer fired on interface %s.\n", debug("%s: RXMT timer fired on interface %s for nigh: %d.\n",
p->name, ifa->iface->name); p->name, ifa->iface->name, n->rid);
if(n->state<NEIGHBOR_LOADING) ospf_dbdes_tx(n); if(n->state<NEIGHBOR_LOADING) ospf_dbdes_tx(n);
/* else FIXME I should dealloc ldbdes */ else
{
tm_stop(n->rxmt_timer);
/* FIXME I should dealloc ldbdes */
}
} }
int int
@ -336,6 +339,8 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
break; break;
} }
n->imms.byte=ps->imms.byte;
if(ps->options!=n->options) /* Options differs */ if(ps->options!=n->options) /* Options differs */
{ {
DBG("SEQMIS-OPT\n"); DBG("SEQMIS-OPT\n");
@ -366,13 +371,14 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
} }
else else
{ {
if(ps->ddseq!=(n->dds+1)) /* SLAVE */ if(ntohl(ps->ddseq)!=(n->dds+1)) /* SLAVE */
{ {
DBG("SEQMIS-SLAVE\n"); DBG("SEQMIS-SLAVE\n");
ospf_neigh_sm(n, INM_SEQMIS); ospf_neigh_sm(n, INM_SEQMIS);
break; break;
} }
n->ddr=ps->ddseq; n->ddr=ntohl(ps->ddseq);
n->dds=ntohl(ps->ddseq);
ospf_dbdes_reqladd(ps,p,n); ospf_dbdes_reqladd(ps,p,n);
ospf_dbdes_tx(n); ospf_dbdes_tx(n);
} }