From: Martin Willi <martin@revosec.ch>
Date: Fri, 12 Dec 2014 11:05:24 +0000 (+0100)
Subject: apple: Use precancelable poll() to wrap accept/recvmsg calls
X-Git-Tag: 5.2.2rc1~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e4620adfb29ae4767b9951d0d93d7840db2a7f9;p=thirdparty%2Fstrongswan.git

apple: Use precancelable poll() to wrap accept/recvmsg calls

To make accept/recvmsg cancelable, we wrap them with poll. As poll itself
does not honor pending cancellations when entering the function, we use our
variant that checks for pending cancellation requests before entering poll().
---

diff --git a/src/libstrongswan/utils/compat/apple.h b/src/libstrongswan/utils/compat/apple.h
index 06a7887e7b..77e0722799 100644
--- a/src/libstrongswan/utils/compat/apple.h
+++ b/src/libstrongswan/utils/compat/apple.h
@@ -34,6 +34,10 @@
 /* Mach uses a semaphore_create() call, use a different name for ours */
 #define semaphore_create(x) strongswan_semaphore_create(x)
 
+/* forward declaration, see below */
+static inline int precancellable_poll(struct pollfd fds[], nfds_t nfds,
+									  int timeout);
+
 /* on Mac OS X 10.5 several system calls we use are no cancellation points.
  * fortunately, select isn't one of them, so we wrap some of the others with
  * calls to select(2).
@@ -44,7 +48,7 @@
 		.fd = socket, \
 		.events = POLLIN, \
 	}; \
-	if (poll(&pfd, 1, -1) <= 0) \
+	if (precancellable_poll(&pfd, 1, -1) <= 0) \
 	{\
 		return -1; \
 	}\