Merge pull request #18582 from zmw12306/route_lost

babeld: Fix starvation handling on route loss per RFC 8966 §3.8.2.1
This commit is contained in:
Russ White 2025-04-08 10:52:39 -04:00 committed by GitHub
commit 53a8868331
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1078,17 +1078,26 @@ route_lost(struct source *src, unsigned oldmetric)
new_route = find_best_route(src->prefix, src->plen, 1, NULL);
if(new_route) {
consider_route(new_route);
} else if(oldmetric < INFINITY) {
/* Avoid creating a blackhole. */
send_update_resend(NULL, src->prefix, src->plen);
/* If the route was usable enough, try to get an alternate one.
If it was not, we could be dealing with oscillations around
the value of INFINITY. */
if(oldmetric <= INFINITY / 2)
} else {
struct babel_route *unfeasible = find_best_route(src->prefix, src->plen, 0, NULL);
if(unfeasible && !route_expired(unfeasible)) {
/* MUST send seqno request when we have unexpired unfeasible routes */
send_request_resend(NULL, src->prefix, src->plen,
src->metric >= INFINITY ?
src->seqno : seqno_plus(src->seqno, 1),
seqno_plus(src->seqno, 1),
src->id);
} else if(oldmetric < INFINITY) {
/* Avoid creating a blackhole. */
send_update_resend(NULL, src->prefix, src->plen);
/* If the route was usable enough, try to get an alternate one.
If it was not, we could be dealing with oscillations around
the value of INFINITY. */
if(oldmetric <= INFINITY / 2)
send_request_resend(NULL, src->prefix, src->plen,
src->metric >= INFINITY ?
src->seqno : seqno_plus(src->seqno, 1),
src->id);
}
}
}