No longer wait for the RTR process to finish the config reload before
authorclaudio <claudio@openbsd.org>
Tue, 14 Feb 2023 15:33:46 +0000 (15:33 +0000)
committerclaudio <claudio@openbsd.org>
Tue, 14 Feb 2023 15:33:46 +0000 (15:33 +0000)
sending the IMSG_RECONF_DONE message to the RDE. The RDE does not depend
on the RTR config reload (in contrast to the SE).
The ROA / ASPA reload is async from the RDE config reload.
OK tb@

usr.sbin/bgpd/bgpd.c

index 5e4dbcd..b1f5c0e 100644 (file)
@@ -1,4 +1,4 @@
-/*     $OpenBSD: bgpd.c,v 1.256 2023/01/20 10:30:41 claudio Exp $ */
+/*     $OpenBSD: bgpd.c,v 1.257 2023/02/14 15:33:46 claudio Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -984,9 +984,9 @@ dispatch_imsg(struct imsgbuf *ibuf, int idx, struct bgpd_config *conf)
                                break;
                        }
                        if (idx == PFD_PIPE_SESSION) {
+                               /* RDE and RTR engine can reload concurrently */
                                imsg_compose(ibuf_rtr, IMSG_RECONF_DONE, 0,
                                    0, -1, NULL, 0);
-                       } else if (idx == PFD_PIPE_RTR) {
                                imsg_compose(ibuf_rde, IMSG_RECONF_DONE, 0,
                                    0, -1, NULL, 0);