X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=test%2Futils.c;h=862e033ec0f0ac1ad83bdedfc70345ffbe939b99;hb=2f014ef78a8bcbf6cdac86bf9602e4a4903cf51e;hp=d7505ced77f4f8e8d513f591405e1fece2e12578;hpb=6bf3ea32f0afa91f1fed494542e873ca6abca9c9;p=meshlink diff --git a/test/utils.c b/test/utils.c index d7505ced..862e033e 100644 --- a/test/utils.c +++ b/test/utils.c @@ -8,9 +8,9 @@ #include "utils.h" -void set_sync_flag(struct sync_flag *s) { +void set_sync_flag(struct sync_flag *s, bool value) { pthread_mutex_lock(&s->mutex); - s->flag = true; + s->flag = value; pthread_cond_broadcast(&s->cond); pthread_mutex_unlock(&s->mutex); } @@ -21,8 +21,9 @@ bool wait_sync_flag(struct sync_flag *s, int seconds) { timeout.tv_sec += seconds; while(!s->flag) - if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) + if(!pthread_cond_timedwait(&s->cond, &s->mutex, &timeout) || errno != EINTR) { break; + } return s->flag; } @@ -69,11 +70,13 @@ void open_meshlink_pair(meshlink_handle_t **pa, meshlink_handle_t **pb, const ch // Don't poll in the application thread, use a condition variable to signal when the peer is online. static void pair_status_cb(meshlink_handle_t *mesh, meshlink_node_t *node, bool reachable) { - set_sync_flag(mesh->priv); + (void)node; + + set_sync_flag(mesh->priv, reachable); } void start_meshlink_pair(meshlink_handle_t *a, meshlink_handle_t *b) { - struct sync_flag pair_status = {}; + struct sync_flag pair_status = {.flag = false}; a->priv = &pair_status; meshlink_set_node_status_cb(a, pair_status_cb);