From: Martin Willi <martin@revosec.ch>
Date: Thu, 6 Nov 2014 13:40:52 +0000 (+0100)
Subject: apple: Wrap accept() and recvfrom() with poll(2) instead of select
X-Git-Tag: 5.2.2dr1~34^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec3d5fb7fa4105acabd30f82a9461360cd3161b;p=thirdparty%2Fstrongswan.git

apple: Wrap accept() and recvfrom() with poll(2) instead of select
---

diff --git a/src/libstrongswan/utils/compat/apple.h b/src/libstrongswan/utils/compat/apple.h
index eb24d621de..06a7887e7b 100644
--- a/src/libstrongswan/utils/compat/apple.h
+++ b/src/libstrongswan/utils/compat/apple.h
@@ -39,21 +39,27 @@
  * calls to select(2).
  */
 
-#define WRAP_WITH_SELECT(func, socket, ...)\
-	fd_set rfds; FD_ZERO(&rfds); FD_SET(socket, &rfds);\
-	if (select(socket + 1, &rfds, NULL, NULL, NULL) <= 0) { return -1; }\
+#define WRAP_WITH_POLL(func, socket, ...) \
+	struct pollfd pfd = { \
+		.fd = socket, \
+		.events = POLLIN, \
+	}; \
+	if (poll(&pfd, 1, -1) <= 0) \
+	{\
+		return -1; \
+	}\
 	return func(socket, __VA_ARGS__)
 
 static inline int cancellable_accept(int socket, struct sockaddr *address,
 									 socklen_t *address_len)
 {
-	WRAP_WITH_SELECT(accept, socket, address, address_len);
+	WRAP_WITH_POLL(accept, socket, address, address_len);
 }
 #define accept cancellable_accept
 static inline int cancellable_recvfrom(int socket, void *buffer, size_t length,
 				int flags, struct sockaddr *address, socklen_t *address_len)
 {
-	WRAP_WITH_SELECT(recvfrom, socket, buffer, length, flags, address, address_len);
+	WRAP_WITH_POLL(recvfrom, socket, buffer, length, flags, address, address_len);
 }
 #define recvfrom cancellable_recvfrom