More deadlock fixes in new I/O.

2014-03-20 14:00:05 -07:00
parent 6f5a4d7e29
commit 7a45ff460d
2 changed files with 18 additions and 2 deletions
--- 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);
 		}
 	}