about summary refs log tree commit diff
path: root/src/network/socket.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/network/socket.c')
-rw-r--r--src/network/socket.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/network/socket.c b/src/network/socket.c
index 4f1e86db..ba8d45b1 100644
--- a/src/network/socket.c
+++ b/src/network/socket.c
@@ -1,7 +1,20 @@
 #include <sys/socket.h>
+#include <fcntl.h>
+#include <errno.h>
 #include "syscall.h"
 
 int socket(int domain, int type, int protocol)
 {
-	return socketcall(socket, domain, type, protocol, 0, 0, 0);
+	int s = socketcall(socket, domain, type, protocol, 0, 0, 0);
+	if (s<0 && errno==EINVAL && (type&(SOCK_CLOEXEC|SOCK_NONBLOCK))) {
+		s = socketcall(socket, domain,
+			type & ~(SOCK_CLOEXEC|SOCK_NONBLOCK),
+			protocol, 0, 0, 0);
+		if (s < 0) return s;
+		if (type & SOCK_CLOEXEC)
+			fcntl(s, F_SETFD, FD_CLOEXEC);
+		if (type & SOCK_NONBLOCK)
+			fcntl(s, F_SETFL, fcntl(s, F_GETFL) | O_NONBLOCK);
+	}
+	return s;
 }