summaryrefslogtreecommitdiff
path: root/watchfrr
diff options
context:
space:
mode:
authorMark Stapp <mjs@voltanet.io>2020-07-17 17:09:51 -0400
committerMark Stapp <mjs@voltanet.io>2020-10-23 12:16:52 -0400
commit5047884528ec263215504cb5df12ebd2422cc392 (patch)
tree952121f1a904ef9c86c1f7336a3aae757eeb3434 /watchfrr
parentb3d6bc6ef0140a194b4bc2993a6aba72ab5d54c9 (diff)
*: unify thread/event cancel macros
Replace all lib/thread cancel macros, use thread_cancel() everywhere. Only the THREAD_OFF macro and thread_cancel() api are supported. Also adjust thread_cancel_async() to NULL caller's pointer (if present). Signed-off-by: Mark Stapp <mjs@voltanet.io>
Diffstat (limited to 'watchfrr')
-rw-r--r--watchfrr/watchfrr.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index cd5ec6725d..319bd6a771 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -586,6 +586,7 @@ static void restart_done(struct daemon *dmn)
return;
}
THREAD_OFF(dmn->t_wakeup);
+
if (try_connect(dmn) < 0)
SET_WAKEUP_DOWN(dmn);
}