mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-12-22 17:51:53 +00:00
Code Releases Activity

BFD: Fixed reconfiguration issues

Browse Source 
After converting BFD to the new IO loop system, reconfiguration never
really worked. Sadly, we missed this case in our testing suite so it
passed under the radar for quite a while.

Thanks to Andrei Dinu <andrei.dinu@digitalit.ro> for reporting and
isolating this issue.
This commit is contained in:
Maria Matejka 2023-05-29 19:32:26 +02:00
parent 6a3e5c2ae8
commit 5ba9878b4f
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
proto/bfd/bfd.c
View File

@ -528,7 +528,7 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
if (EMPTY_LIST(s->request_list)) if (EMPTY_LIST(s->request_list))
return; return;
birdloop_enter(p->p.loop); ASSERT_DIE(birdloop_inside(p->p.loop));
struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(s->request_list)); struct bfd_request *req = SKIP_BACK(struct bfd_request, n, HEAD(s->request_list));
s->cf = bfd_merge_options(s->ifa->cf, &req->opts); s->cf = bfd_merge_options(s->ifa->cf, &req->opts);
@ -541,8 +541,6 @@ bfd_reconfigure_session(struct bfd_proto *p, struct bfd_session *s)
bfd_session_control_tx_timer(s, 0); bfd_session_control_tx_timer(s, 0);
birdloop_leave(p->p.loop);
TRACE(D_EVENTS, "Session to %I reconfigured", s->addr); TRACE(D_EVENTS, "Session to %I reconfigured", s->addr);
} }
@ -614,7 +612,7 @@ bfd_free_iface(struct bfd_iface *ifa)
} }
static void static void
bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_config *nc) bfd_reconfigure_iface(struct bfd_proto *p UNUSED, struct bfd_iface *ifa, struct bfd_config *nc)
{ {
struct bfd_iface_config *new = bfd_find_iface_config(nc, ifa->iface); struct bfd_iface_config *new = bfd_find_iface_config(nc, ifa->iface);
struct bfd_iface_config *old = ifa->cf; struct bfd_iface_config *old = ifa->cf;
@ -628,9 +626,7 @@ bfd_reconfigure_iface(struct bfd_proto *p, struct bfd_iface *ifa, struct bfd_con
(new->passive != old->passive); (new->passive != old->passive);
/* This should be probably changed to not access ifa->cf from the BFD thread */ /* This should be probably changed to not access ifa->cf from the BFD thread */
birdloop_enter(p->p.loop);
ifa->cf = new; ifa->cf = new;
birdloop_leave(p->p.loop);
} }
@ -873,7 +869,12 @@ bfd_update_request(struct bfd_request *req, const struct bfd_options *opts)
req->opts = *opts; req->opts = *opts;
if (s) if (s)
bfd_reconfigure_session(s->ifa->bfd, s); {
struct bfd_proto *p = s->ifa->bfd;
birdloop_enter(p->p.loop);
bfd_reconfigure_session(p, s);
birdloop_leave(p->p.loop);
}
} }
static void static void