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

Fixes a bug in RA_ACCEPTED handling.

Browse source
This commit is contained in:
Ondrej Zajicek 2012-05-11 12:01:27 +02:00
parent 9b2b502be5
commit b7f3df7905
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nest/rt-table.c
View file

@ -354,7 +354,7 @@ rt_notify_accepted(struct announce_hook *ah, net *net, rte *new_changed, rte *ol
rte *old_free = NULL; rte *old_free = NULL;
rte *r; rte *r;
/* Used to track whethe we met old_changed position. If it is NULL /* Used to track whether we met old_changed position. If it is NULL
it was the first and met it implicitly before current best route. */ it was the first and met it implicitly before current best route. */
int old_meet = (old_changed && !before_old) ? 1 : 0; int old_meet = (old_changed && !before_old) ? 1 : 0;
@ -1415,12 +1415,13 @@ again:
return 0; return 0;
} }
if (p->accept_ra_types == RA_OPTIMAL) if ((p->accept_ra_types == RA_OPTIMAL) ||
(p->accept_ra_types == RA_ACCEPTED))
if (e) if (e)
{ {
if (p->core_state != FS_FEEDING) if (p->core_state != FS_FEEDING)
return 1; /* In the meantime, the protocol fell down. */ return 1; /* In the meantime, the protocol fell down. */
do_feed_baby(p, RA_OPTIMAL, h, n, e); do_feed_baby(p, p->accept_ra_types, h, n, e);
max_feed--; max_feed--;
} }