#include <netinet/tcp.h>
#include <netdb.h>
+static memcached_return set_hostinfo(memcached_server_st *server)
+{
+ struct hostent *h;
+#ifdef HAVE_GETHOSTBYNAME_R
+ struct hostent h_static;
+ char buffer[SMALL_STRING_LEN];
+ int tmp_error;
+
+ if (gethostbyname_r(server->hostname,
+ &h_static, buffer, SMALL_STRING_LEN,
+ &h, &tmp_error))
+ {
+ WATCHPOINT_STRING(server->hostname);
+ WATCHPOINT_STRING(hstrerror(tmp_error));
+ return MEMCACHED_HOST_LOOKUP_FAILURE;
+ }
+#else
+ if ((h= gethostbyname(server->hostname)) == NULL)
+ {
+ WATCHPOINT_STRING(server->hostname);
+ WATCHPOINT_STRING(hstrerror(h_errno));
+ return MEMCACHED_HOST_LOOKUP_FAILURE;
+ }
+#endif
+
+ 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);
+
+ return MEMCACHED_SUCCESS;
+}
+
static memcached_return unix_socket_connect(memcached_st *ptr, unsigned int server_key)
{
struct sockaddr_un servAddr;
{
if ((ptr->hosts[server_key].fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
{
- ptr->my_errno= errno;
+ ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
}
memset(&servAddr, 0, sizeof (struct sockaddr_un));
servAddr.sun_family= AF_UNIX;
- strcpy(servAddr.sun_path, ptr->hosts[server_key].hostname);
+ strcpy(servAddr.sun_path, ptr->hosts[server_key].hostname); /* Copy filename */
addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
test_connect:
- if (connect(ptr->hosts[server_key].fd, (struct sockaddr_un *)&servAddr, sizeof(servAddr)) < 0)
+ if (connect(ptr->hosts[server_key].fd,
+ (struct sockaddr *)&servAddr,
+ sizeof(servAddr)) < 0)
{
switch (errno) {
/* We are spinning waiting on connect */
case EISCONN: /* We were spinning waiting on connect */
break;
default:
- ptr->my_errno= errno;
+ ptr->cached_errno= errno;
return MEMCACHED_ERRNO;
}
ptr->connected++;
return MEMCACHED_SUCCESS;
}
-static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
+static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
{
- struct sockaddr_in servAddr;
- struct hostent *h;
-
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 ((h= gethostbyname(ptr->hosts[server_key].hostname)) == NULL)
+ /*
+ 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)))
{
- ptr->my_errno= h_errno;
- return MEMCACHED_HOST_LOCKUP_FAILURE;
+ memcached_return rc;
+
+ rc= set_hostinfo(&ptr->hosts[server_key]);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
+
+ ptr->hosts[server_key].sockaddr_inited= MEMCACHED_ALLOCATED;
}
- servAddr.sin_family= h->h_addrtype;
- memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
- servAddr.sin_port = htons(ptr->hosts[server_key].port);
+ /* Create the socket */
+ if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_DGRAM, 0)) < 0)
+ {
+ ptr->cached_errno= errno;
+ return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+ }
+ }
+
+ return MEMCACHED_SUCCESS;
+}
+
+static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
+{
+ 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].servAddr.sin_family == 0)
+ {
+ memcached_return rc;
+
+ rc= set_hostinfo(&ptr->hosts[server_key]);
+ if (rc != MEMCACHED_SUCCESS)
+ return rc;
+ }
/* Create the socket */
if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
{
- ptr->my_errno= errno;
+ ptr->cached_errno= errno;
return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
}
/* connect to server */
test_connect:
- if (connect(ptr->hosts[server_key].fd, (struct sockaddr *)&servAddr, sizeof(servAddr)) < 0)
+ if (connect(ptr->hosts[server_key].fd,
+ (struct sockaddr *)&ptr->hosts[server_key].servAddr,
+ sizeof(struct sockaddr)) < 0)
{
switch (errno) {
/* We are spinning waiting on connect */
case EISCONN: /* We were spinning waiting on connect */
break;
default:
- ptr->my_errno= errno;
+ ptr->cached_errno= errno;
return MEMCACHED_ERRNO;
}
ptr->connected++;
memcached_return rc= MEMCACHED_NO_SERVERS;
LIBMEMCACHED_MEMCACHED_CONNECT_START();
- if (ptr->connected == ptr->number_of_hosts)
+ if (ptr->connected == ptr->number_of_hosts && ptr->number_of_hosts)
return MEMCACHED_SUCCESS;
- if (!ptr->hosts)
+ if (ptr->hosts == NULL || ptr->number_of_hosts == 0)
return MEMCACHED_NO_SERVERS;
/* We need to clean up the multi startup piece */
if (server_key)
+ {
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;
+ }
+
+ if (rc != MEMCACHED_SUCCESS)
+ WATCHPOINT_ERROR(rc);
+ }
else
{
unsigned int x;
switch (ptr->hosts[x].type)
{
case MEMCACHED_CONNECTION_UNKNOWN:
- case MEMCACHED_CONNECTION_UDP:
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;
rc= MEMCACHED_SUCCESS;
if (possible_rc != MEMCACHED_SUCCESS)
+ {
+ WATCHPOINT_ERROR(possible_rc);
rc= MEMCACHED_SOME_ERRORS;
+ }
}
}
LIBMEMCACHED_MEMCACHED_CONNECT_END();