diff options
| author |   claudio <claudio@openbsd.org> | 2018-11-08 09:59:45 +0000 |
|---|---|---|
| committer | claudio <claudio@openbsd.org> | 2018-11-08 09:59:45 +0000 |
| commit | b2e34e9cb9722df71a849b998c46e35a2471315e (patch) | |
| tree | ed2068ac09d8c55b627042c8bc7426798272fe3a | |
| parent | Committed wrong version. Check the flags against the fib flags from the (diff) | |
| download | wireguard-openbsd-b2e34e9cb9722df71a849b998c46e35a2471315e.tar.xz wireguard-openbsd-b2e34e9cb9722df71a849b998c46e35a2471315e.zip | |
Introduce rde_update_queue_pending() similar to rib_dump_pending() it checks
if there are any neighbors that have pending updates. If so the timeout of
the poll loop is set to 0 so that the work is completet ASAP.
The regress test was not working because of this. The RDE was stuck in poll()
instead of sending the updates out.
Tested and OK denis@
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 3f6df071f06..32f38c3eaaa 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.447 2018/11/08 09:53:38 claudio Exp $ */ +/* $OpenBSD: rde.c,v 1.448 2018/11/08 09:59:45 claudio Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -81,6 +81,7 @@ static void rde_softreconfig_out_done(void *, u_int8_t); static void rde_softreconfig_done(void); static void rde_softreconfig_out(struct rib_entry *, void *); static void rde_softreconfig_in(struct rib_entry *, void *); +int rde_update_queue_pending(void); void rde_update_queue_runner(void); void rde_update6_queue_runner(u_int8_t); struct rde_prefixset *rde_find_prefixset(char *, struct rde_prefixset_head *); @@ -255,7 +256,7 @@ rde_main(int debug, int verbose) set_pollfd(&pfd[PFD_PIPE_SESSION], ibuf_se); set_pollfd(&pfd[PFD_PIPE_SESSION_CTL], ibuf_se_ctl); - if (rib_dump_pending()) + if (rib_dump_pending() || rde_update_queue_pending()) timeout = 0; i = PFD_PIPE_COUNT; @@ -2585,6 +2586,31 @@ rde_up_dump_done(void *ptr, u_int8_t aid) u_char queue_buf[4096]; +int +rde_update_queue_pending(void) +{ + struct rde_peer *peer; + u_int8_t aid; + + if (ibuf_se && ibuf_se->w.queued >= SESS_MSG_HIGH_MARK) + return 0; + + LIST_FOREACH(peer, &peerlist, peer_l) { + if (peer->conf.id == 0) + continue; + if (peer->state != PEER_UP) + continue; + if (peer->throttled) + continue; + for (aid = 0; aid < AID_MAX; aid++) { + if (!TAILQ_EMPTY(&peer->updates[aid]) || + !TAILQ_EMPTY(&peer->withdraws[aid])) + return 1; + } + } + return 0; +} + void rde_update_queue_runner(void) { |