1 files changed, 17 insertions, 5 deletions

diff --git a/ot_livesync.c b/ot_livesync.c
index 45271bc..4a0ede1 100644
--- a/ot_livesync.c
+++ b/ot_livesync.c
@@ -8,6 +8,7 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
 
@@ -53,6 +54,8 @@ static sync_buffer g_v6_buf;
 static sync_buffer g_v4_buf;
 
 static pthread_t   thread_id;
+static int         thread_started;
+static _Atomic int thread_left;
 void livesync_init(void) {
   uint32_t packet_type6 = htonl(OT_SYNC_PEER6);
   uint32_t packet_type4 = htonl(OT_SYNC_PEER4);
@@ -73,16 +76,24 @@ void livesync_init(void) {
   g_v6_buf.next_packet_time = time_future_seconds(LIVESYNC_MAXDELAY);
   g_v4_buf.next_packet_time = time_future_seconds(LIVESYNC_MAXDELAY);
 
-  pthread_create(&thread_id, NULL, livesync_worker, NULL);
+  thread_started = !pthread_create(&thread_id, NULL, livesync_worker, NULL);
 }
 
 void livesync_deinit(void) {
+  if (thread_started) {
+    /* Repeats so it interrupts a read already under way */
+    while (!atomic_load(&thread_left)) {
+      pthread_kill(thread_id, OT_SIGNAL_WAKE);
+      usleep(1000);
+    }
+    pthread_join(thread_id, NULL);
+    thread_started = 0;
+  }
+
   if (g_socket_in != -1)
     close(g_socket_in);
   if (g_socket_out != -1)
     close(g_socket_out);
-
-  pthread_cancel(thread_id);
 }
 
 void livesync_bind_mcast(ot_ip6 ip, uint16_t port) {
@@ -195,7 +206,7 @@ static void *livesync_worker(void *args) {
   ws.inbuf = ws.request = malloc(LIVESYNC_INCOMING_BUFFSIZE);
   ws.outbuf = ws.reply = 0;
 
-  while (1) {
+  while (g_opentracker_running) {
     uint32_t packet_type;
 
     ws.request_size = socket_recv(g_socket_in, ws.inbuf, LIVESYNC_INCOMING_BUFFSIZE, in_ip, &in_port);
@@ -224,7 +235,8 @@ static void *livesync_worker(void *args) {
     }
   }
 
-  /* Never returns. */
+  free(ws.inbuf);
+  atomic_store(&thread_left, 1);
   return NULL;
 }