From 7a45ff460d493dd6cf94441039a795b3ce9ffe1f Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Thu, 20 Mar 2014 14:00:05 -0700
Subject: More deadlock fixes in new I/O.

---
 node/SocketManager.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'node/SocketManager.cpp')

diff --git a/node/SocketManager.cpp b/node/SocketManager.cpp
index c2261e7a..9539af38 100644
--- a/node/SocketManager.cpp
+++ b/node/SocketManager.cpp
@@ -266,6 +266,7 @@ SocketManager::SocketManager(
 			}
 
 			_udpV6Socket = SharedPtr<Socket>(new UdpSocket(Socket::ZT_SOCKET_TYPE_UDP_V6,s));
+			fcntl(s,F_SETFL,O_NONBLOCK);
 			FD_SET(s,&_readfds);
 		}
 
@@ -316,6 +317,7 @@ SocketManager::SocketManager(
 			}
 
 			_udpV4Socket = SharedPtr<Socket>(new UdpSocket(Socket::ZT_SOCKET_TYPE_UDP_V4,s));
+			fcntl(s,F_SETFL,O_NONBLOCK);
 			FD_SET(s,&_readfds);
 		}
 	}
-- 
cgit v1.2.3