X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fconnect.cc;h=aa2c7def7e4904c7f769d43bdf4c459be9333ee7;hb=1ed39cb2d0601d753ef54be65f24334097f48805;hp=65be51a07f9a2c509f7dba7bc6c11043e358bc1a;hpb=3946da421f695bdc5eda65f70ab8f7a4e1786586;p=awesomized%2Flibmemcached diff --git a/libmemcached/connect.cc b/libmemcached/connect.cc index 65be51a0..aa2c7def 100644 --- a/libmemcached/connect.cc +++ b/libmemcached/connect.cc @@ -39,15 +39,13 @@ #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 @@ -95,7 +93,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 +124,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 +155,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; @@ -300,7 +299,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 +314,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); } @@ -346,7 +345,7 @@ 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); } @@ -356,7 +355,7 @@ static void set_socket_options(org::libmemcached::Instance* server) int flag= 1; int error= setsockopt(server->fd, IPPROTO_TCP, TCP_NODELAY, - &flag, (socklen_t)sizeof(int)); + (char*)&flag, (socklen_t)sizeof(int)); (void)(error); assert(error == 0); } @@ -366,7 +365,7 @@ 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); } @@ -375,7 +374,7 @@ static void set_socket_options(org::libmemcached::Instance* server) if (server->root->tcp_keepidle > 0) { int error= setsockopt(server->fd, IPPROTO_TCP, TCP_KEEPIDLE, - &server->root->tcp_keepidle, (socklen_t)sizeof(int)); + (char*)&server->root->tcp_keepidle, (socklen_t)sizeof(int)); (void)(error); assert(error == 0); } @@ -384,7 +383,7 @@ static void set_socket_options(org::libmemcached::Instance* server) 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,7 +391,7 @@ 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); } @@ -512,13 +511,16 @@ 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); } +#ifdef HAVE_FCNTL // If SOCK_CLOEXEC exists then we don't need to call the following if (SOCK_CLOEXEC == 0) { @@ -531,6 +533,7 @@ static memcached_return_t network_connect(org::libmemcached::Instance* server) } while (rval == -1 && (errno == EINTR or errno == EAGAIN)); } } +#endif set_socket_options(server); @@ -732,6 +735,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);