X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet_socket.c;fp=src%2Fnet_socket.c;h=7c4463eaab1d28089f259dbb380bdfb829a0b504;hb=b107b10c4ef70bdf74d6d6ac57ff5ab2698b9cb2;hp=e20076fbe00d9f97e71406f3c95c8193fddfa8c8;hpb=9e00aaa5be9c92f1cee93bca3f0e473009cc3541;p=tinc

diff --git a/src/net_socket.c b/src/net_socket.c
index e20076fb..7c4463ea 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -237,28 +237,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 		return -1;
 	}
 
-#ifdef O_NONBLOCK
-	{
-		int flags = fcntl(nfd, F_GETFL);
-
-		if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
-			closesocket(nfd);
-			logger(LOG_ERR, "System call `%s' failed: %s", "fcntl",
-				   strerror(errno));
-			return -1;
-		}
-	}
-#elif defined(WIN32)
-	{
-		unsigned long arg = 1;
-		if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
-			closesocket(nfd);
-			logger(LOG_ERR, "Call to `%s' failed: %s", "ioctlsocket", sockstrerror(sockerrno));
-			return -1;
-		}
-	}
-#endif
-
 	option = 1;
 	setsockopt(nfd, SOL_SOCKET, SO_REUSEADDR, (void *)&option, sizeof option);