ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Fix the Mac libcutils build."

Browse source
This commit is contained in:
Elliott Hughes 2015-07-18 17:53:38 +00:00 • committed by Gerrit Code Review
commit ff2016599d
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libcutils/socket_network_client.c
View file

@ -29,17 +29,12 @@
#include <cutils/sockets.h> #include <cutils/sockets.h>
static int fix_O_NONBLOCK(int s, int type) { static int toggle_O_NONBLOCK(int s) {
// If the caller actually wanted a non-blocking socket, fine.
if ((type & SOCK_NONBLOCK)) return s;
// Otherwise clear the O_NONBLOCK flag.
int flags = fcntl(s, F_GETFL); int flags = fcntl(s, F_GETFL);
if (flags == -1 || fcntl(s, F_SETFL, flags & ~O_NONBLOCK) == -1) { if (flags == -1 || fcntl(s, F_SETFL, flags ^ O_NONBLOCK) == -1) {
close(s); close(s);
return -1; return -1;
} }
return s; return s;
} }
@ -69,12 +64,13 @@ int socket_network_client_timeout(const char* host, int port, int type, int time
freeaddrinfo(addrs); freeaddrinfo(addrs);
int s = socket(family, type | SOCK_NONBLOCK, protocol); // The Mac doesn't have SOCK_NONBLOCK.
if (s == -1) return -1; int s = socket(family, type, protocol);
if (s == -1 || toggle_O_NONBLOCK(s) == -1) return -1;
int rc = connect(s, (const struct sockaddr*) &addr, addr_len); int rc = connect(s, (const struct sockaddr*) &addr, addr_len);
if (rc == 0) { if (rc == 0) {
return fix_O_NONBLOCK(s, type); return toggle_O_NONBLOCK(s);
} else if (rc == -1 && errno != EINPROGRESS) { } else if (rc == -1 && errno != EINPROGRESS) {
close(s); close(s);
return -1; return -1;
@ -116,7 +112,7 @@ int socket_network_client_timeout(const char* host, int port, int type, int time
return -1; return -1;
} }
return fix_O_NONBLOCK(s, type); return toggle_O_NONBLOCK(s);
} }
int socket_network_client(const char* host, int port, int type) { int socket_network_client(const char* host, int port, int type) {