diff options
Diffstat (limited to 'libcutils')
| -rw-r--r-- | libcutils/Android.mk | 17 | ||||
| -rw-r--r-- | libcutils/socket_network_client.c | 80 |
2 files changed, 81 insertions, 16 deletions
diff --git a/libcutils/Android.mk b/libcutils/Android.mk index 945ebdd..e1d6f49 100644 --- a/libcutils/Android.mk +++ b/libcutils/Android.mk @@ -27,13 +27,6 @@ commonSources := \ hashmap.c \ atomic.c.arm \ native_handle.c \ - socket_inaddr_any_server.c \ - socket_local_client.c \ - socket_local_server.c \ - socket_loopback_client.c \ - socket_loopback_server.c \ - socket_network_client.c \ - sockets.c \ config_utils.c \ cpu_info.c \ load_file.c \ @@ -67,7 +60,15 @@ endif ifneq ($(WINDOWS_HOST_ONLY),1) commonSources += \ fs.c \ - multiuser.c + multiuser.c \ + socket_inaddr_any_server.c \ + socket_local_client.c \ + socket_local_server.c \ + socket_loopback_client.c \ + socket_loopback_server.c \ + socket_network_client.c \ + sockets.c \ + endif diff --git a/libcutils/socket_network_client.c b/libcutils/socket_network_client.c index c52013d..4826033 100644 --- a/libcutils/socket_network_client.c +++ b/libcutils/socket_network_client.c @@ -15,18 +15,17 @@ */ #include <errno.h> +#include <fcntl.h> #include <stddef.h> #include <stdlib.h> #include <string.h> #include <unistd.h> -#ifndef HAVE_WINSOCK #include <sys/socket.h> #include <sys/select.h> #include <sys/types.h> #include <netinet/in.h> #include <netdb.h> -#endif #include <cutils/sockets.h> @@ -36,27 +35,92 @@ */ int socket_network_client(const char *host, int port, int type) { + return socket_network_client_timeout(host, port, type, 0); +} + +/* Connect to port on the IP interface. type is SOCK_STREAM or SOCK_DGRAM. + * timeout in seconds return is a file descriptor or -1 on error + */ +int socket_network_client_timeout(const char *host, int port, int type, int timeout) +{ struct hostent *hp; struct sockaddr_in addr; + socklen_t alen; int s; + int flags = 0, error = 0, ret = 0; + fd_set rset, wset; + socklen_t len = sizeof(error); + struct timeval ts; + + ts.tv_sec = timeout; + ts.tv_usec = 0; hp = gethostbyname(host); - if(hp == 0) return -1; - + if (hp == 0) return -1; + memset(&addr, 0, sizeof(addr)); addr.sin_family = hp->h_addrtype; addr.sin_port = htons(port); memcpy(&addr.sin_addr, hp->h_addr, hp->h_length); s = socket(hp->h_addrtype, type, 0); - if(s < 0) return -1; + if (s < 0) return -1; - if(connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) { + if ((flags = fcntl(s, F_GETFL, 0)) < 0) { close(s); return -1; } - return s; + if (fcntl(s, F_SETFL, flags | O_NONBLOCK) < 0) { + close(s); + return -1; + } -} + if ((ret = connect(s, (struct sockaddr *) &addr, sizeof(addr))) < 0) { + if (errno != EINPROGRESS) { + close(s); + return -1; + } + } + + if (ret == 0) + goto done; + + FD_ZERO(&rset); + FD_SET(s, &rset); + wset = rset; + if ((ret = select(s + 1, &rset, &wset, NULL, (timeout) ? &ts : NULL)) < 0) { + close(s); + return -1; + } + if (ret == 0) { // we had a timeout + errno = ETIMEDOUT; + close(s); + return -1; + } + + if (FD_ISSET(s, &rset) || FD_ISSET(s, &wset)) { + if (getsockopt(s, SOL_SOCKET, SO_ERROR, &error, &len) < 0) { + close(s); + return -1; + } + } else { + close(s); + return -1; + } + + if (error) { // check if we had a socket error + errno = error; + close(s); + return -1; + } + +done: + if (fcntl(s, F_SETFL, flags) < 0) { + close(s); + return -1; + } + + return s; +} |