summaryrefslogtreecommitdiff
path: root/usr.sbin
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2018-08-09 12:54:07 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2018-08-09 12:54:07 +0000
commitacbd1291f79bc9f961fe4ffdd2eaa9b29e93d4d6 (patch)
tree3ccdd64512badb688db26279206a6ca6f8302d97 /usr.sbin
parent6ffdc8f1fd6d28bb8cce4efcdff3539e5a748534 (diff)
While softreconfig is running set the poll timeout to 0 so that the
runner makes progress and does not get hold back by poll sleeping at the same time fds are still serviced first if they have data pending.
Diffstat (limited to 'usr.sbin')
-rw-r--r--usr.sbin/bgpd/rde.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c
index 8ee91c291fb..5d8053c9a17 100644
--- a/usr.sbin/bgpd/rde.c
+++ b/usr.sbin/bgpd/rde.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rde.c,v 1.413 2018/08/08 13:08:54 claudio Exp $ */
+/* $OpenBSD: rde.c,v 1.414 2018/08/09 12:54:06 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -268,6 +268,8 @@ rde_main(int debug, int verbose)
if (rde_dump_pending() &&
ibuf_se_ctl && ibuf_se_ctl->w.queued == 0)
timeout = 0;
+ if (softreconfig)
+ timeout = 0;
i = PFD_PIPE_COUNT;
for (mctx = LIST_FIRST(&rde_mrts); mctx != 0; mctx = xmctx) {