#include "common.h"
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/tcp.h>
-#include <netdb.h>
-
static memcached_return set_hostinfo(memcached_server_st *server)
{
- struct hostent *h;
+ struct addrinfo *ai;
+ struct addrinfo hints;
+ int e;
+ char str_port[NI_MAXSERV];
+
+ sprintf(str_port, "%u", server->port);
+
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_socktype= SOCK_STREAM;
+ hints.ai_protocol= 0;
- if ((h= gethostbyname(server->hostname)) == NULL)
+ e= getaddrinfo(server->hostname, str_port, &hints, &ai);
+ if (e != 0)
{
- return MEMCACHED_HOST_LOCKUP_FAILURE;
+ WATCHPOINT_STRING(server->hostname);
+ WATCHPOINT_STRING(gai_strerror(e));
+ return MEMCACHED_HOST_LOOKUP_FAILURE;
}
- server->servAddr.sin_family= h->h_addrtype;
- memcpy((char *) &server->servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- server->servAddr.sin_port = htons(server->port);
+ if (server->address_info)
+ freeaddrinfo(server->address_info);
+ server->address_info= ai;
return MEMCACHED_SUCCESS;
}
case EISCONN: /* We were spinning waiting on connect */
break;
default:
+ WATCHPOINT_ERRNO(errno);
ptr->cached_errno= errno;
return MEMCACHED_ERRNO;
}
if (ptr->hosts[server_key].fd == -1)
{
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
-
- if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED)
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
+ /*
+ If we have not allocated the hosts object.
+ Or if the cache has not been set.
+ */
+ if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
+ (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
{
if (ptr->hosts[server_key].fd == -1)
{
+ struct addrinfo *use;
+
/* Old connection junk still is in the structure */
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
- if (ptr->hosts[server_key].servAddr.sin_family == 0)
+ if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
+ (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
{
memcached_return rc;
rc= set_hostinfo(&ptr->hosts[server_key]);
if (rc != MEMCACHED_SUCCESS)
return rc;
+ ptr->hosts[server_key].sockaddr_inited= MEMCACHED_ALLOCATED;
}
+ use= ptr->hosts[server_key].address_info;
/* Create the socket */
- if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+ if ((ptr->hosts[server_key].fd= socket(use->ai_family,
+ use->ai_socktype,
+ use->ai_protocol)) < 0)
{
ptr->cached_errno= errno;
+ WATCHPOINT_ERRNO(errno);
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
}
- /* For the moment, not getting a nonblocking mode will note be fatal */
if (ptr->flags & MEM_NO_BLOCK)
{
- int flags;
-
- flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
- if (flags != -1)
- (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+ int error;
+ struct linger linger;
+ struct timeval waittime;
+
+ waittime.tv_sec= 10;
+ waittime.tv_usec= 0;
+
+ linger.l_onoff= 1;
+ linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT;
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_LINGER,
+ &linger, (socklen_t)sizeof(struct linger));
+ WATCHPOINT_ASSERT(error == 0);
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDTIMEO,
+ &waittime, (socklen_t)sizeof(struct timeval));
+ WATCHPOINT_ASSERT(error == 0);
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_RCVTIMEO,
+ &waittime, (socklen_t)sizeof(struct timeval));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->flags & MEM_TCP_NODELAY)
{
int flag= 1;
+ int error;
- setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY,
- &flag, (socklen_t)sizeof(int));
+ error= setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY,
+ &flag, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->send_size)
{
- setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->send_size, (socklen_t)sizeof(int));
+ int error;
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->send_size, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
}
if (ptr->recv_size)
{
- setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
- &ptr->recv_size, (socklen_t)sizeof(int));
+ int error;
+
+ error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF,
+ &ptr->recv_size, (socklen_t)sizeof(int));
+ WATCHPOINT_ASSERT(error == 0);
+ }
+
+ /* For the moment, not getting a nonblocking mode will not be fatal */
+ if (ptr->flags & MEM_NO_BLOCK)
+ {
+ int flags;
+
+ flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
+ if (flags != -1)
+ {
+ (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+ }
}
+
/* connect to server */
test_connect:
if (connect(ptr->hosts[server_key].fd,
- (struct sockaddr *)&ptr->hosts[server_key].servAddr,
- sizeof(struct sockaddr)) < 0)
+ use->ai_addr,
+ use->ai_addrlen) < 0)
{
switch (errno) {
/* We are spinning waiting on connect */
break;
default:
ptr->cached_errno= errno;
+ WATCHPOINT_ERRNO(ptr->cached_errno);
+ close(ptr->hosts[server_key].fd);
+ ptr->hosts[server_key].fd= -1;
return MEMCACHED_ERRNO;
}
ptr->connected++;
}
- WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+
+ WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
}
return MEMCACHED_SUCCESS;
return MEMCACHED_NO_SERVERS;
/* We need to clean up the multi startup piece */
- if (server_key)
+ switch (ptr->hosts[server_key].type)
{
+ case MEMCACHED_CONNECTION_UNKNOWN:
+ WATCHPOINT_ASSERT(0);
+ rc= MEMCACHED_NOT_SUPPORTED;
+ break;
+ case MEMCACHED_CONNECTION_UDP:
+ rc= udp_connect(ptr, server_key);
+ break;
+ case MEMCACHED_CONNECTION_TCP:
rc= tcp_connect(ptr, server_key);
- switch (ptr->hosts[server_key].type)
- {
- case MEMCACHED_CONNECTION_UNKNOWN:
- WATCHPOINT_ASSERT(0);
- rc= MEMCACHED_NOT_SUPPORTED;
- break;
- case MEMCACHED_CONNECTION_UDP:
- rc= udp_connect(ptr, server_key);
- break;
- case MEMCACHED_CONNECTION_TCP:
- rc= tcp_connect(ptr, server_key);
- break;
- case MEMCACHED_CONNECTION_UNIX_SOCKET:
- rc= unix_socket_connect(ptr, server_key);
- break;
- }
+ break;
+ case MEMCACHED_CONNECTION_UNIX_SOCKET:
+ rc= unix_socket_connect(ptr, server_key);
+ break;
}
- else
- {
- unsigned int x;
-
- for (x= 0; x < ptr->number_of_hosts; x++)
- {
- memcached_return possible_rc;
-
- possible_rc= MEMCACHED_NOT_SUPPORTED; /* Remove warning */
- switch (ptr->hosts[x].type)
- {
- case MEMCACHED_CONNECTION_UNKNOWN:
- WATCHPOINT_ASSERT(0);
- possible_rc= MEMCACHED_NOT_SUPPORTED;
- break;
- case MEMCACHED_CONNECTION_UDP:
- possible_rc= udp_connect(ptr, x);
- break;
- case MEMCACHED_CONNECTION_TCP:
- possible_rc= tcp_connect(ptr, x);
- break;
- case MEMCACHED_CONNECTION_UNIX_SOCKET:
- possible_rc= unix_socket_connect(ptr, x);
- break;
- }
- rc= MEMCACHED_SUCCESS;
+ if (rc != MEMCACHED_SUCCESS)
+ WATCHPOINT_ERROR(rc);
- if (possible_rc != MEMCACHED_SUCCESS)
- rc= MEMCACHED_SOME_ERRORS;
- }
- }
LIBMEMCACHED_MEMCACHED_CONNECT_END();
return rc;
projects / awesomized / libmemcached / blobdiff