2 files changed, 6 insertions, 4 deletions

diff --git a/ot_livesync.c b/ot_livesync.c
index b876ef8..c4dc6e5 100644
--- a/ot_livesync.c
+++ b/ot_livesync.c
@@ -5,6 +5,7 @@
 
 /* System */
 #include <arpa/inet.h>
+#include <fcntl.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
@@ -13,7 +14,6 @@
 
 /* Libowfat */
 #include "ip6.h"
-#include "ndelay.h"
 #include "socket.h"
 
 /* Opentracker */
@@ -101,7 +101,8 @@ void livesync_bind_mcast(ot_ip6 ip, uint16_t port) {
 
   if ((g_socket_in = socket_udp4()) < 0)
     exerr("Error: Cant create live sync incoming socket.");
-  ndelay_off(g_socket_in);
+
+  fcntl(g_socket_in, F_SETFL, fcntl(g_socket_in, F_GETFL, 0) & ~O_NONBLOCK);
 
   if (socket_bind4_reuse(g_socket_in, tmpip, port) == -1)
     exerr("Error: Cant bind live sync incoming socket.");
diff --git a/proxy.c b/proxy.c
index d728e5b..ec51630 100644
--- a/proxy.c
+++ b/proxy.c
@@ -7,6 +7,7 @@
 #include <arpa/inet.h>
 #include <ctype.h>
 #include <errno.h>
+#include <fcntl.h>
 #include <pthread.h>
 #include <stdint.h>
 #include <stdio.h>
@@ -19,7 +20,6 @@
 #include "io.h"
 #include "iob.h"
 #include "ip6.h"
-#include "ndelay.h"
 #include "scan.h"
 #include "socket.h"
 
@@ -101,7 +101,8 @@ void livesync_bind_mcast(ot_ip6 ip, uint16_t port) {
 
   if ((g_socket_in = socket_udp4()) < 0)
     exerr("Error: Cant create live sync incoming socket.");
-  ndelay_off(g_socket_in);
+
+  fcntl(g_socket_in, F_SETFL, fcntl(g_socket_in, F_GETFL, 0) & ~O_NONBLOCK);
 
   if (socket_bind4_reuse(g_socket_in, tmpip, port) == -1)
     exerr("Error: Cant bind live sync incoming socket.");