denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Martin Willi
2014-11-21 12:02:08 +01:00
parent f65779dd0f
commit aec3d5fb7f
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libstrongswan/utils/compat/apple.h
+11 -5
View File
@@ -39,21 +39,27 @@
* calls to select(2). * calls to select(2).
*/ */
#define WRAP_WITH_SELECT(func, socket, ...)\ #define WRAP_WITH_POLL(func, socket, ...) \
fd_set rfds; FD_ZERO(&rfds); FD_SET(socket, &rfds);\ struct pollfd pfd = { \
if (select(socket + 1, &rfds, NULL, NULL, NULL) <= 0) { return -1; }\ .fd = socket, \
.events = POLLIN, \
}; \
if (poll(&pfd, 1, -1) <= 0) \
{\
return -1; \
}\
return func(socket, __VA_ARGS__) return func(socket, __VA_ARGS__)
static inline int cancellable_accept(int socket, struct sockaddr *address, static inline int cancellable_accept(int socket, struct sockaddr *address,
socklen_t *address_len) socklen_t *address_len)
{ {
WRAP_WITH_SELECT(accept, socket, address, address_len); WRAP_WITH_POLL(accept, socket, address, address_len);
} }
#define accept cancellable_accept #define accept cancellable_accept
static inline int cancellable_recvfrom(int socket, void *buffer, size_t length, static inline int cancellable_recvfrom(int socket, void *buffer, size_t length,
int flags, struct sockaddr *address, socklen_t *address_len) 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 #define recvfrom cancellable_recvfrom