diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-20 14:00:05 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2014-03-20 14:00:05 -0700 |
| commit | 7a45ff460d493dd6cf94441039a795b3ce9ffe1f (patch) | |
| tree | ab29d2c7b70513e60e6b44f7d797ddc052086f37 /node/SocketManager.cpp | |
| parent | 6f5a4d7e2984916379b11d688ccc54cac473239e (diff) | |
| download | infinitytier-7a45ff460d493dd6cf94441039a795b3ce9ffe1f.tar.gz infinitytier-7a45ff460d493dd6cf94441039a795b3ce9ffe1f.zip | |
More deadlock fixes in new I/O.
Diffstat (limited to 'node/SocketManager.cpp')
| -rw-r--r-- | node/SocketManager.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
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); } } |