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

Fixed stupid bug with hello vs inactim timers.

Browse source
This commit is contained in:
Ondrej Filip 1999-06-02 16:31:13 +00:00
parent bae0f7dbb1
commit 39369d6fbe
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
proto/ospf/ospf.c
View file

@ -82,7 +82,7 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
if(ps->options!=ifa->options) if(ps->options!=ifa->options)
{ {
log("%s: Bad OSPF packet from %d received: options mismatch.", log("%s: Bad OSPF packet from %d received: options mismatch.",
p->name, nrid); p->name, nrid); /* FIXME: This not good */
log("%s: Discarding",p->name); log("%s: Discarding",p->name);
return; return;
} }
@ -115,9 +115,7 @@ ospf_hello_rx(struct ospf_hello_packet *ps, struct proto *p,
n->bdr=ntohl(ps->bdr); n->bdr=ntohl(ps->bdr);
n->priority=ps->priority; n->priority=ps->priority;
n->options=ps->options; n->options=ps->options;
tm_start(ifa->hello_timer,ifa->deadc*ifa->helloint); tm_start(n->inactim,ifa->deadc*ifa->helloint);
/* XXXX */
switch(ifa->state) switch(ifa->state)
{ {
@ -467,12 +465,12 @@ ospf_add_timers(struct ospf_iface *ifa, pool *pool, int wait)
/* Add hello timer */ /* Add hello timer */
ifa->hello_timer=tm_new(pool); ifa->hello_timer=tm_new(pool);
ifa->hello_timer->data=ifa; ifa->hello_timer->data=ifa;
ifa->hello_timer->randomize=1; ifa->hello_timer->randomize=0;
if(ifa->helloint==0) ifa->helloint=HELLOINT_D; if(ifa->helloint==0) ifa->helloint=HELLOINT_D;
ifa->hello_timer->hook=hello_timer_hook; ifa->hello_timer->hook=hello_timer_hook;
ifa->hello_timer->recurrent=ifa->helloint; ifa->hello_timer->recurrent=ifa->helloint;
tm_start(ifa->hello_timer,ifa->helloint); tm_start(ifa->hello_timer,ifa->helloint);
DBG("%s: Installing hello timer.\n", p->name); DBG("%s: Installing hello timer. (%d)\n", p->name, ifa->helloint);
if((ifa->type!=OSPF_IT_PTP)) if((ifa->type!=OSPF_IT_PTP))
{ {
/* Install wait timer on NOT-PtP interfaces */ /* Install wait timer on NOT-PtP interfaces */
@ -483,8 +481,7 @@ ospf_add_timers(struct ospf_iface *ifa, pool *pool, int wait)
ifa->wait_timer->recurrent=0; ifa->wait_timer->recurrent=0;
ifa->state=OSPF_IS_WAITING; ifa->state=OSPF_IS_WAITING;
tm_start(ifa->wait_timer,(wait!=0 ? wait : WAIT_DMH*ifa->helloint)); tm_start(ifa->wait_timer,(wait!=0 ? wait : WAIT_DMH*ifa->helloint));
DBG(p->name); DBG("%s: Installing wait timer. (%d)\n", p->name, (wait!=0 ? wait : WAIT_DMH*ifa->helloint));
DBG(": Installing wait timer.\n");
} }
else ifa->state=OSPF_IS_PTP; else ifa->state=OSPF_IS_PTP;
} }