1 files changed, 9 insertions, 7 deletions

diff --git a/opentracker.c b/opentracker.c
index f579b92..e0f16d7 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -49,7 +49,9 @@ static void         panic(const char *routine) {
   exit(111);
 }
 
-/* Say we are stopping, wake the loop, and let main do the work on its own stack. */
+/* Say we are stopping, wake the loop, and let main do the work on its own
+   stack. Everything other than SIGINT falls through and does nothing, which
+   is what OT_SIGNAL_WAKE wants: returning from the read is all it is for. */
 static void signal_handler(int s) {
   if (s == SIGINT) {
     const char byte  = 0;
@@ -85,7 +87,8 @@ static void install_signal_handlers(void) {
   sa.sa_handler = signal_handler;
   sigemptyset(&sa.sa_mask);
   sa.sa_flags = 0;
-  if ((sigaction(SIGINT, &sa, NULL) == -1) || (sigaction(SIGALRM, &sa, NULL) == -1))
+  if ((sigaction(SIGINT, &sa, NULL) == -1) || (sigaction(SIGALRM, &sa, NULL) == -1) ||
+      (sigaction(OT_SIGNAL_WAKE, &sa, NULL) == -1))
     panic("install_signal_handlers");
 
   sigaddset(&signal_mask, SIGINT);
@@ -397,7 +400,6 @@ static void listen_start_udp_workers(void) {
     if (entry->proto != FLAG_UDP || entry->workers <= 0)
       continue;
 
-    socket_set_blocking((int)entry->sock, 1);
     event_del((int)entry->sock);
     udp_worker_install(entry->sock);
 
@@ -409,8 +411,7 @@ static void listen_start_udp_workers(void) {
         if (sock == -1) {
           fprintf(stderr, "Warning: could not bind another socket for udp worker %d: %s. Sharing the first instead.\n", worker, strerror(errno));
           sock = entry->sock;
-        } else
-          socket_set_blocking((int)sock, 1);
+        }
       }
       udp_worker_install(sock);
     }
@@ -548,9 +549,10 @@ int main(int argc, char **argv) {
   listen_start_udp_workers();
 
   server_mainloop(0);
+  udp_workers_deinit();
 
-  /* The loop has left, so no thread is serving any more and the teardown
-     can run where a debugger and the sanitizers can follow it */
+  /* No thread is serving any more, so the teardown can run where a debugger
+     and the sanitizers can follow it */
   trackerlogic_deinit();
 #ifdef WANT_SYSLOGS
   closelog();