mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-11-09 12:48:43 +00:00
Code Releases Activity

Babel: Initialise source seqno from incoming message

Browse Source 
When creating a new babel_source object we initialise the seqno to 0. The
caller will update the source object with the right metric and seqno value,
for both newly created and old source objects. However if we initialise the
source object seqno to 0 that may actually turn out to be a valid (higher)
seqno than the one in the routing table, because of seqno wrapping. In this
case the source metric will not be set properly, which breaks feasibility
tracking for subsequent updates.

To fix this, add a new initial_seqno argument to babel_get_source() which
is used when allocating a new object, and set that to the seqno value of
the update we're sending.

Thanks to Juliusz Chroboczek for the bugreport.
This commit is contained in:
Toke Høiland-Jørgensen 2023-01-31 15:52:14 +01:00 committed by Ondrej Zajicek
parent 96d7c4679d
commit dc4c5f51f8
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proto/babel/babel.c
View File

@ -105,7 +105,8 @@ babel_find_source(struct babel_entry *e, u64 router_id)
} }
static struct babel_source * static struct babel_source *
babel_get_source(struct babel_proto *p, struct babel_entry *e, u64 router_id) babel_get_source(struct babel_proto *p, struct babel_entry *e, u64 router_id,
u16 initial_seqno)
{ {
struct babel_source *s = babel_find_source(e, router_id); struct babel_source *s = babel_find_source(e, router_id);
@ -115,7 +116,7 @@ babel_get_source(struct babel_proto *p, struct babel_entry *e, u64 router_id)
s = sl_allocz(p->source_slab); s = sl_allocz(p->source_slab);
s->router_id = router_id; s->router_id = router_id;
s->expires = current_time() + BABEL_GARBAGE_INTERVAL; s->expires = current_time() + BABEL_GARBAGE_INTERVAL;
s->seqno = 0; s->seqno = initial_seqno;
s->metric = BABEL_INFINITY; s->metric = BABEL_INFINITY;
add_tail(&e->sources, NODE s); add_tail(&e->sources, NODE s);
@ -1011,10 +1012,10 @@ babel_send_update_(struct babel_iface *ifa, btime changed, struct fib *rtable)
babel_enqueue(&msg, ifa); babel_enqueue(&msg, ifa);
/* Update feasibility distance for redistributed routes */ /* RFC 6126 3.7.3 - update feasibility distance for redistributed routes */
if (e->router_id != p->router_id) if (e->router_id != p->router_id)
{ {
struct babel_source *s = babel_get_source(p, e, e->router_id); struct babel_source *s = babel_get_source(p, e, e->router_id, msg.update.seqno);
s->expires = current_time() + BABEL_GARBAGE_INTERVAL; s->expires = current_time() + BABEL_GARBAGE_INTERVAL;
if (gt_mod64k(msg.update.seqno, s->seqno) || if (gt_mod64k(msg.update.seqno, s->seqno) ||