X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=2543148bd9aaeb2add1569c517b19fef2f947191;hb=536b80be9fdd66690d14d08bead3d2c4527ce1da;hp=65be51a07f9a2c509f7dba7bc6c11043e358bc1a;hpb=8c008a3516e571c1efa9ba9c50bdbaddf6e94217;p=m6w6%2Flibmemcached diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc index 65be51a0..2543148b 100644 --- a/libmemcached/connect.cc +++ b/libmemcached/connect.cc @@ -39,21 +39,31 @@ #include #include -#include -#include #ifndef SOCK_CLOEXEC # define SOCK_CLOEXEC 0 #endif #ifndef SOCK_NONBLOCK -# define SOCK_NONBLOCK 0 +# define SOCK_NONBLOCK 0 #endif #ifndef FD_CLOEXEC # define FD_CLOEXEC 0 #endif +#ifndef SO_NOSIGPIPE +# define SO_NOSIGPIPE 0 +#endif + +#ifndef TCP_NODELAY +# define TCP_NODELAY 0 +#endif + +#ifndef TCP_KEEPIDLE +# define TCP_KEEPIDLE 0 +#endif + static memcached_return_t connect_poll(org::libmemcached::Instance* server) { struct pollfd fds[1]; @@ -95,7 +105,7 @@ static memcached_return_t connect_poll(org::libmemcached::Instance* server) { int err; socklen_t len= sizeof(err); - if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0) + if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, (char*)&err, &len) == 0) { if (err == 0) { @@ -126,7 +136,7 @@ static memcached_return_t connect_poll(org::libmemcached::Instance* server) { int err; socklen_t len= sizeof (err); - if (getsockopt(fds[0].fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0) + if (getsockopt(fds[0].fd, SOL_SOCKET, SO_ERROR, (char*)&err, &len) == 0) { // We check the value to see what happened wth the socket. if (err == 0) @@ -157,11 +167,12 @@ static memcached_return_t set_hostinfo(org::libmemcached::Instance* server) server->address_info_next= NULL; } - char str_port[NI_MAXSERV]; - int length= snprintf(str_port, NI_MAXSERV, "%u", uint32_t(server->port())); - if (length >= NI_MAXSERV or length <= 0) + char str_port[MEMCACHED_NI_MAXSERV]; + int length= snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port())); + if (length >= MEMCACHED_NI_MAXSERV or length <= 0) { - return MEMCACHED_FAILURE; + return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, + memcached_literal_param("snprintf(NI_MAXSERV)")); } struct addrinfo hints; @@ -282,13 +293,38 @@ static inline void set_socket_nonblocking(org::libmemcached::Instance* server) #endif } -static void set_socket_options(org::libmemcached::Instance* server) +static bool set_socket_options(org::libmemcached::Instance* server) { assert_msg(server->fd != INVALID_SOCKET, "invalid socket was passed to set_socket_options()"); +#ifdef HAVE_FCNTL + // If SOCK_CLOEXEC exists then we don't need to call the following + if (SOCK_CLOEXEC == 0) + { + if (FD_CLOEXEC) + { + int flags; + do + { + flags= fcntl(server->fd, F_GETFD, 0); + } while (flags == -1 and (errno == EINTR or errno == EAGAIN)); + + if (flags != -1) + { + int rval; + do + { + rval= fcntl (server->fd, F_SETFD, flags | FD_CLOEXEC); + } while (rval == -1 && (errno == EINTR or errno == EAGAIN)); + // we currently ignore the case where rval is -1 + } + } + } +#endif + if (memcached_is_udp(server->root)) { - return; + return true; } #ifdef HAVE_SNDTIMEO @@ -300,7 +336,7 @@ static void set_socket_options(org::libmemcached::Instance* server) waittime.tv_usec= server->root->snd_timeout % 1000000; int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDTIMEO, - &waittime, (socklen_t)sizeof(struct timeval)); + (char*)&waittime, (socklen_t)sizeof(struct timeval)); (void)error; assert(error == 0); } @@ -315,7 +351,7 @@ static void set_socket_options(org::libmemcached::Instance* server) waittime.tv_usec= server->root->rcv_timeout % 1000000; int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVTIMEO, - &waittime, (socklen_t)sizeof(struct timeval)); + (char*)&waittime, (socklen_t)sizeof(struct timeval)); (void)(error); assert(error == 0); } @@ -323,6 +359,7 @@ static void set_socket_options(org::libmemcached::Instance* server) #if defined(__MACH__) && defined(__APPLE__) || defined(__FreeBSD__) + if (SO_NOSIGPIPE) { int set= 1; int error= setsockopt(server->fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&set, sizeof(int)); @@ -346,19 +383,22 @@ static void set_socket_options(org::libmemcached::Instance* server) linger.l_onoff= 1; linger.l_linger= 0; /* By default on close() just drop the socket */ int error= setsockopt(server->fd, SOL_SOCKET, SO_LINGER, - &linger, (socklen_t)sizeof(struct linger)); + (char*)&linger, (socklen_t)sizeof(struct linger)); (void)(error); assert(error == 0); } - if (server->root->flags.tcp_nodelay) + if (TCP_NODELAY) { - int flag= 1; + if (server->root->flags.tcp_nodelay) + { + int flag= 1; - int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY, - &flag, (socklen_t)sizeof(int)); - (void)(error); - assert(error == 0); + int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY, + (char*)&flag, (socklen_t)sizeof(int)); + (void)(error); + assert(error == 0); + } } if (server->root->flags.tcp_keepalive) @@ -366,25 +406,26 @@ static void set_socket_options(org::libmemcached::Instance* server) int flag= 1; int error= setsockopt(server->fd, SOL_SOCKET, SO_KEEPALIVE, - &flag, (socklen_t)sizeof(int)); + (char*)&flag, (socklen_t)sizeof(int)); (void)(error); assert(error == 0); } -#ifdef TCP_KEEPIDLE - if (server->root->tcp_keepidle > 0) + if (TCP_KEEPIDLE) { - int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE, - &server->root->tcp_keepidle, (socklen_t)sizeof(int)); - (void)(error); - assert(error == 0); + if (server->root->tcp_keepidle > 0) + { + int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE, + (char*)&server->root->tcp_keepidle, (socklen_t)sizeof(int)); + (void)(error); + assert(error == 0); + } } -#endif if (server->root->send_size > 0) { int error= setsockopt(server->fd, SOL_SOCKET, SO_SNDBUF, - &server->root->send_size, (socklen_t)sizeof(int)); + (char*)&server->root->send_size, (socklen_t)sizeof(int)); (void)(error); assert(error == 0); } @@ -392,13 +433,15 @@ static void set_socket_options(org::libmemcached::Instance* server) if (server->root->recv_size > 0) { int error= setsockopt(server->fd, SOL_SOCKET, SO_RCVBUF, - &server->root->recv_size, (socklen_t)sizeof(int)); + (char*)&server->root->recv_size, (socklen_t)sizeof(int)); (void)(error); assert(error == 0); } /* libmemcached will always use nonblocking IO to avoid write deadlocks */ set_socket_nonblocking(server); + + return true; } static memcached_return_t unix_socket_connect(org::libmemcached::Instance* server) @@ -512,28 +555,21 @@ static memcached_return_t network_connect(org::libmemcached::Instance* server) type|= SOCK_NONBLOCK; } - if ((server->fd= socket(server->address_info_next->ai_family, - type, - server->address_info_next->ai_protocol)) < 0) + server->fd= socket(server->address_info_next->ai_family, + type, + server->address_info_next->ai_protocol); + + if (int(server->fd) == SOCKET_ERROR) { return memcached_set_errno(*server, get_socket_errno(), NULL); } - // If SOCK_CLOEXEC exists then we don't need to call the following - if (SOCK_CLOEXEC == 0) + if (set_socket_options(server) == false) { - if (FD_CLOEXEC) - { - int rval; - do - { - rval= fcntl (server->fd, F_SETFD, FD_CLOEXEC); - } while (rval == -1 && (errno == EINTR or errno == EAGAIN)); - } + (void)closesocket(server->fd); + return MEMCACHED_CONNECTION_FAILURE; } - set_socket_options(server); - /* connect to server */ if ((connect(server->fd, server->address_info_next->ai_addr, server->address_info_next->ai_addrlen) != SOCKET_ERROR)) { @@ -732,6 +768,7 @@ static memcached_return_t _memcached_connect(org::libmemcached::Instance* server if (server->fd != INVALID_SOCKET and server->root->sasl.callbacks) { rc= memcached_sasl_authenticate_connection(server); + fprintf(stderr, "%s:%d %s\n", __FILE__, __LINE__, memcached_strerror(NULL, rc)); if (memcached_failed(rc) and server->fd != INVALID_SOCKET) { WATCHPOINT_ASSERT(server->fd != INVALID_SOCKET);