mirror/labs-bird
1
0
Fork 0
mirror of https://gitlab.labs.nic.cz/labs/bird.git synced 2024-05-11 16:54:54 +00:00
Code Releases Activity

Fixed several bugs in protocol state machine. Reconfigurations and

Browse Source 
restarts of BGP seem to work now.
This commit is contained in:
Martin Mares
2000-04-26 12:30:41 +00:00
parent c010f4cb37
commit ebd3720f83
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nest/proto.c
View File

@@ -288,12 +288,17 @@ proto_rethink_goal(struct proto *p)
/* Determine what state we want to reach */ /* Determine what state we want to reach */
if (p->disabled || p->reconfiguring) if (p->disabled || p->reconfiguring)
{
p->core_goal = FS_HUNGRY; p->core_goal = FS_HUNGRY;
else if (p->core_state == FS_HUNGRY && p->proto_state == PS_DOWN)
p->core_goal = FS_HAPPY;
if (p->core_state == p->core_goal)
return; return;
}
else
{
p->core_goal = FS_HAPPY;
if (p->core_state == FS_HAPPY && p->proto_state == PS_UP)
return;
}
q = p->proto; q = p->proto;
if (p->core_goal == FS_HAPPY) /* Going up */ if (p->core_goal == FS_HAPPY) /* Going up */
@@ -424,6 +429,7 @@ proto_notify_state(struct proto *p, unsigned ps)
case PS_DOWN: case PS_DOWN:
if (cs == FS_HUNGRY) /* Shutdown finished */ if (cs == FS_HUNGRY) /* Shutdown finished */
{ {
p->proto_state = ps;
proto_fell_down(p); proto_fell_down(p);
return; /* The protocol might have ceased to exist */ return; /* The protocol might have ceased to exist */
} }
@@ -445,7 +451,7 @@ proto_notify_state(struct proto *p, unsigned ps)
ev_schedule(p->attn); ev_schedule(p->attn);
break; break;
case PS_STOP: case PS_STOP:
if (cs == FS_FEEDING || cs == FS_HAPPY) if (ops != PS_DOWN)
{ {
schedule_flush: schedule_flush:
DBG("%s: Scheduling flush\n", p->name); DBG("%s: Scheduling flush\n", p->name);