3 files changed, 19 insertions, 0 deletions

diff --git a/ot_udp.c b/ot_udp.c
index 26fb979..fae2c87 100644
--- a/ot_udp.c
+++ b/ot_udp.c
@@ -28,6 +28,10 @@ static uint32_t g_rijndael_round_key[44] = {0};
 static volatile uint32_t g_key_of_the_hour[2] = {0};
 static volatile ot_time  g_hour_of_the_key;
 
+static pthread_mutex_t udp_start_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t udp_start_cond = PTHREAD_COND_INITIALIZER;
+static int g_opentracker_started = 0;
+
 static void     udp_generate_rijndael_round_key(void) {
   uint32_t key[16];
 #ifdef WANT_ARC4RANDOM
@@ -223,6 +227,11 @@ static void *udp_worker(void *args) {
   ws.debugbuf = malloc(G_DEBUGBUF_SIZE);
 #endif
 
+  pthread_mutex_lock(&udp_start_mutex);
+  while(g_opentracker_running && !g_opentracker_started)
+    pthread_cond_wait(&udp_start_cond, &udp_start_mutex);
+  pthread_mutex_unlock(&udp_start_mutex);
+
   while (g_opentracker_running)
     handle_udp6(sock, &ws);
 
@@ -244,3 +253,10 @@ void udp_init(int64 sock, unsigned int worker_count) {
   while (worker_count--)
     pthread_create(&thread_id, NULL, udp_worker, (void *)sock);
 }
+
+void udp_kickoff(void) {
+  pthread_mutex_lock(&udp_start_mutex);
+  g_opentracker_started = 1;
+  pthread_cond_broadcast(&udp_start_cond);
+  pthread_mutex_unlock(&udp_start_mutex);
+}
diff --git a/ot_udp.h b/ot_udp.h
index a71a3d9..db48696 100644
--- a/ot_udp.h
+++ b/ot_udp.h
@@ -7,6 +7,7 @@
 #define OT_UDP_H__
 
 void udp_init(int64 sock, unsigned int worker_count);
+void udp_kickoff(void);
 int  handle_udp6(int64 serversocket, struct ot_workstruct *ws);
 
 #endif
diff --git a/trackerlogic.c b/trackerlogic.c
index cacb12b..7c6b7e1 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -28,6 +28,7 @@
 #include "ot_mutex.h"
 #include "ot_stats.h"
 #include "ot_vector.h"
+#include "ot_udp.h"
 #include "trackerlogic.h"
 
 /* Forward declaration */
@@ -566,6 +567,7 @@ void trackerlogic_init(void) {
   accesslist_init();
   livesync_init();
   stats_init();
+  udp_kickoff();
 }
 
 void trackerlogic_deinit(void) {