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

Another bugfix. (In EXCHANGE state.)

Browse source
This commit is contained in:
Ondrej Filip 1999-11-17 13:28:51 +00:00
parent e17baa3108
commit 2af2636a69
1 changed files with 29 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
proto/ospf/ospf.c
View file

@ -58,39 +58,38 @@ ospf_pkt_finalize(struct ospf_iface *ifa, struct ospf_packet *pkt)
} }
void void
ospf_dbdes_tx(struct ospf_iface *ifa) ospf_dbdes_tx(struct ospf_neighbor *n)
{ {
struct ospf_dbdes_packet *pkt; struct ospf_dbdes_packet *pkt;
struct ospf_packet *op; struct ospf_packet *op;
struct ospf_neighbor *n; struct ospf_iface *ifa;
u16 length; u16 length;
struct proto *p; struct proto *p;
ifa=n->ifa;
p=(struct proto *)(ifa->proto); p=(struct proto *)(ifa->proto);
WALK_LIST (n, ifa->neigh_list) /* Try to send db_des */ switch(n->state)
{ {
switch(n->state) case NEIGHBOR_EXSTART: /* Send empty packets */
{ pkt=(struct ospf_dbdes_packet *)(ifa->ip_sk->tbuf);
case NEIGHBOR_EXSTART: /* Send empty packets */ op=(struct ospf_packet *)pkt;
pkt=(struct ospf_dbdes_packet *)(ifa->ip_sk->tbuf);
op=(struct ospf_packet *)pkt;
fill_ospf_pkt_hdr(ifa, pkt, DBDES); fill_ospf_pkt_hdr(ifa, pkt, DBDES);
pkt->iface_mtu= ((struct iface *)ifa)->mtu; pkt->iface_mtu= ((struct iface *)ifa)->mtu;
pkt->options= ifa->options; pkt->options= ifa->options;
pkt->imms=n->myimms; pkt->imms=n->myimms;
pkt->ddseq=n->dds; pkt->ddseq=n->dds;
length=sizeof(struct ospf_dbdes_packet); length=sizeof(struct ospf_dbdes_packet);
op->length=htons(length); op->length=htons(length);
ospf_pkt_finalize(ifa, op); ospf_pkt_finalize(ifa, op);
sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO); sk_send_to(ifa->ip_sk,length, n->ip, OSPF_PROTO);
debug("%s: DB_DES sent for %u.\n", p->name, n->rid); debug("%s: DB_DES sent for %u.\n", p->name, n->rid);
/*case NEIGHBOR_EXCHANGE: */ /*case NEIGHBOR_EXCHANGE: */
default: /* Ignore it */ default: /* Ignore it */
break; break;
}
} }
} }
@ -99,12 +98,16 @@ rxmt_timer_hook(timer *timer)
{ {
struct ospf_iface *ifa; struct ospf_iface *ifa;
struct proto *p; struct proto *p;
struct ospf_neighbor *n;
ifa=(struct ospf_iface *)timer->data; ifa=(struct ospf_iface *)timer->data;
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.\n",
p->name, ifa->iface->name); p->name, ifa->iface->name);
ospf_dbdes_tx(ifa); WALK_LIST (n, ifa->neigh_list) /* Try to send db_des */
{
ospf_dbdes_tx(n);
}
} }
struct ospf_neighbor * struct ospf_neighbor *
@ -659,15 +662,11 @@ ospf_dbdes_rx(struct ospf_dbdes_packet *ps, struct proto *p,
{ {
/* Duplicate packet */ /* Duplicate packet */
debug("%s: Received duplicate dbdes from (%u)!\n", p->name, nrid); debug("%s: Received duplicate dbdes from (%u)!\n", p->name, nrid);
if(IAMMASTER(n->imms)) if(!IAMMASTER(n->imms))
{ {
return; ospf_dbdes_tx(n);
}
else
{
/* FIXME: Send response! */
return;
} }
return;
} }
if(IAMMASTER(ps->imms)!=IAMMASTER(n->myimms)) /* M/S bit differs */ if(IAMMASTER(ps->imms)!=IAMMASTER(n->myimms)) /* M/S bit differs */