X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=dc86d1e12727567f6b93824429a146dbad66f601;hb=89453bb8a7c9593c48635165b780918bc277c6c5;hp=1a7cde1676dc2e536607fe5547f9d8637f0db6ab;hpb=0104faa2803775d4f1b2c1115f4b6a8025252041;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 1a7cde16..dc86d1e1 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,53 +1,124 @@
 #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>
+#include <poll.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))
+  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_family= AF_INET;
+  if (server->type == MEMCACHED_CONNECTION_UDP)
   {
-    WATCHPOINT_STRING(server->hostname);
-    WATCHPOINT_STRING(hstrerror(tmp_error));
-    return MEMCACHED_HOST_LOOKUP_FAILURE;
+    hints.ai_protocol= IPPROTO_UDP;
+    hints.ai_socktype= SOCK_DGRAM;
   }
-#else
-  if ((h= gethostbyname(server->hostname)) == NULL)
+  else
+  {
+    hints.ai_socktype= SOCK_STREAM;
+    hints.ai_protocol= IPPROTO_TCP;
+  }
+
+  e= getaddrinfo(server->hostname, str_port, &hints, &ai);
+  if (e != 0)
   {
     WATCHPOINT_STRING(server->hostname);
-    WATCHPOINT_STRING(hstrerror(h_errno));
+    WATCHPOINT_STRING(gai_strerror(e));
     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);
+  if (server->address_info)
+    freeaddrinfo(server->address_info);
+  server->address_info= ai;
+
+  return MEMCACHED_SUCCESS;
+}
+
+static memcached_return set_socket_options(memcached_server_st *ptr)
+{
+  if (ptr->type == MEMCACHED_CONNECTION_UDP)
+    return MEMCACHED_SUCCESS;
+
+  if (ptr->root->flags & MEM_NO_BLOCK)
+  {
+    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->fd, SOL_SOCKET, SO_LINGER, 
+                      &linger, (socklen_t)sizeof(struct linger));
+    WATCHPOINT_ASSERT(error == 0);
+
+    error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDTIMEO, 
+                      &waittime, (socklen_t)sizeof(struct timeval));
+    WATCHPOINT_ASSERT(error == 0);
+
+    error= setsockopt(ptr->fd, SOL_SOCKET, SO_RCVTIMEO, 
+                      &waittime, (socklen_t)sizeof(struct timeval));
+    WATCHPOINT_ASSERT(error == 0);
+  }
+
+  if (ptr->root->flags & MEM_TCP_NODELAY)
+  {
+    int flag= 1;
+    int error;
+
+    error= setsockopt(ptr->fd, IPPROTO_TCP, TCP_NODELAY, 
+                      &flag, (socklen_t)sizeof(int));
+    WATCHPOINT_ASSERT(error == 0);
+  }
+
+  if (ptr->root->send_size)
+  {
+    int error;
+
+    error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDBUF, 
+                      &ptr->root->send_size, (socklen_t)sizeof(int));
+    WATCHPOINT_ASSERT(error == 0);
+  }
+
+  if (ptr->root->recv_size)
+  {
+    int error;
+
+    error= setsockopt(ptr->fd, SOL_SOCKET, SO_SNDBUF, 
+                      &ptr->root->recv_size, (socklen_t)sizeof(int));
+    WATCHPOINT_ASSERT(error == 0);
+  }
+
+  /* For the moment, not getting a nonblocking mode will not be fatal */
+  if (ptr->root->flags & MEM_NO_BLOCK)
+  {
+    int flags;
 
-  server->servAddr.sin_port = htons(server->port);
+    flags= fcntl(ptr->fd, F_GETFL, 0);
+    if (flags != -1)
+    {
+      (void)fcntl(ptr->fd, F_SETFL, flags | O_NONBLOCK);
+    }
+  }
 
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return unix_socket_connect(memcached_st *ptr, unsigned int server_key)
+static memcached_return unix_socket_connect(memcached_server_st *ptr)
 {
   struct sockaddr_un servAddr;
   socklen_t addrlen;
 
-  if (ptr->hosts[server_key].fd == -1)
+  if (ptr->fd == -1)
   {
-    if ((ptr->hosts[server_key].fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+    if ((ptr->fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
     {
       ptr->cached_errno= errno;
       return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
@@ -55,217 +126,166 @@ static memcached_return unix_socket_connect(memcached_st *ptr, unsigned int serv
 
     memset(&servAddr, 0, sizeof (struct sockaddr_un));
     servAddr.sun_family= AF_UNIX;
-    strcpy(servAddr.sun_path, ptr->hosts[server_key].hostname); /* Copy filename */
+    strcpy(servAddr.sun_path, ptr->hostname); /* Copy filename */
 
     addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
 
 test_connect:
-    if (connect(ptr->hosts[server_key].fd, 
+    if (connect(ptr->fd, 
                 (struct sockaddr *)&servAddr,
                 sizeof(servAddr)) < 0)
     {
       switch (errno) {
-        /* We are spinning waiting on connect */
-      case EALREADY:
       case EINPROGRESS:
+      case EALREADY:
       case EINTR:
         goto test_connect;
       case EISCONN: /* We were spinning waiting on connect */
         break;
       default:
+        WATCHPOINT_ERRNO(errno);
         ptr->cached_errno= errno;
         return MEMCACHED_ERRNO;
       }
-      ptr->connected++;
     }
   }
   return MEMCACHED_SUCCESS;
 }
 
-static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
+static memcached_return network_connect(memcached_server_st *ptr)
 {
-  if (ptr->hosts[server_key].fd == -1)
+  if (ptr->fd == -1)
   {
-    /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 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;
+    struct addrinfo *use;
 
-      rc= set_hostinfo(&ptr->hosts[server_key]);
-      if (rc != MEMCACHED_SUCCESS)
-        return rc;
-
-      ptr->hosts[server_key].sockaddr_inited= MEMCACHED_ALLOCATED;
-    }
-
-    /* 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);
+    WATCHPOINT_ASSERT(ptr->cursor_active == 0);
 
-    if (ptr->hosts[server_key].servAddr.sin_family == 0)
+    if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
+        (!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
     {
       memcached_return rc;
 
-      rc= set_hostinfo(&ptr->hosts[server_key]);
+      rc= set_hostinfo(ptr);
       if (rc != MEMCACHED_SUCCESS)
         return rc;
+      ptr->sockaddr_inited= MEMCACHED_ALLOCATED;
     }
 
+    use= ptr->address_info;
     /* Create the socket */
-    if ((ptr->hosts[server_key].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-    {
-      ptr->cached_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)
+    while (use != NULL)
     {
-      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);
-    }
-
-    if (ptr->flags & MEM_TCP_NODELAY)
-    {
-      int flag= 1;
-
-      setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
-                 &flag, (socklen_t)sizeof(int));
-    }
-
-    if (ptr->send_size)
-    {
-      setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
-                 &ptr->send_size, (socklen_t)sizeof(int));
-    }
+      if ((ptr->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;
+      }
 
-    if (ptr->recv_size)
-    {
-      setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
-                 &ptr->recv_size, (socklen_t)sizeof(int));
-    }
+      (void)set_socket_options(ptr);
 
-    /* connect to server */
+      /* connect to server */
 test_connect:
-    if (connect(ptr->hosts[server_key].fd, 
-                (struct sockaddr *)&ptr->hosts[server_key].servAddr, 
-                sizeof(struct sockaddr)) < 0)
-    {
-      switch (errno) {
+      if (connect(ptr->fd, 
+                  use->ai_addr, 
+                  use->ai_addrlen) < 0)
+      {
+        switch (errno) {
+          /* We are spinning waiting on connect */
+        case EALREADY:
+        case EINPROGRESS:
+          {
+            struct pollfd fds[1];
+            int error;
+
+            memset(&fds, 0, sizeof(struct pollfd));
+            fds[0].fd= ptr->fd;
+            fds[0].events= POLLOUT |  POLLERR;
+            error= poll(fds, 1, ptr->root->connect_timeout);
+
+            if (error != 1)
+            {
+              ptr->cached_errno= errno;
+              WATCHPOINT_ERRNO(ptr->cached_errno);
+              close(ptr->fd);
+              ptr->fd= -1;
+              return MEMCACHED_ERRNO;
+            }
+
+            break;
+          }
         /* We are spinning waiting on connect */
-      case EALREADY:
-      case EINPROGRESS:
-      case EINTR:
-        goto test_connect;
-      case EISCONN: /* We were spinning waiting on connect */
-        break;
-      default:
-        ptr->cached_errno= errno;
-        return MEMCACHED_ERRNO;
+        case EINTR:
+          goto test_connect;
+        case EISCONN: /* We were spinning waiting on connect */
+          break;
+        default:
+          ptr->cached_errno= errno;
+          WATCHPOINT_ERRNO(ptr->cached_errno);
+          close(ptr->fd);
+          ptr->fd= -1;
+          if (ptr->root->retry_timeout)
+          {
+            struct timeval next_time;
+
+            gettimeofday(&next_time, NULL);
+            ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+          }
+        }
+      }
+      else
+      {
+        WATCHPOINT_ASSERT(ptr->cursor_active == 0);
+        return MEMCACHED_SUCCESS;
       }
-      ptr->connected++;
+      use = use->ai_next;
     }
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
   }
 
-  return MEMCACHED_SUCCESS;
+  if (ptr->fd == -1)
+    return MEMCACHED_ERRNO; /* The last error should be from connect() */
+
+  return MEMCACHED_SUCCESS; /* The last error should be from connect() */
 }
 
 
-memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key)
+memcached_return memcached_connect(memcached_server_st *ptr)
 {
   memcached_return rc= MEMCACHED_NO_SERVERS;
   LIBMEMCACHED_MEMCACHED_CONNECT_START();
 
-  if (ptr->connected == ptr->number_of_hosts && ptr->number_of_hosts)
-    return MEMCACHED_SUCCESS;
-
-  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)
+  if (ptr->root->retry_timeout)
   {
-    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;
-    }
+    struct timeval next_time;
 
-    if (rc != MEMCACHED_SUCCESS)
-      WATCHPOINT_ERROR(rc);
+    gettimeofday(&next_time, NULL);
+    if (next_time.tv_sec < ptr->next_retry)
+      return MEMCACHED_TIMEOUT;
   }
-  else
+  /* We need to clean up the multi startup piece */
+  switch (ptr->type)
   {
-    unsigned int x;
-
-    for (x= 0; x < ptr->number_of_hosts; x++)
-    {
-      memcached_return possible_rc;
-
-      possible_rc= MEMCACHED_NOT_SUPPORTED; /* Remove warning */
+  case MEMCACHED_CONNECTION_UNKNOWN:
+    WATCHPOINT_ASSERT(0);
+    rc= MEMCACHED_NOT_SUPPORTED;
+    break;
+  case MEMCACHED_CONNECTION_UDP:
+  case MEMCACHED_CONNECTION_TCP:
+    rc= network_connect(ptr);
+    break;
+  case MEMCACHED_CONNECTION_UNIX_SOCKET:
+    rc= unix_socket_connect(ptr);
+    break;
+  default:
+    WATCHPOINT_ASSERT(0);
+  }
 
-      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)
-      {
-        WATCHPOINT_ERROR(possible_rc);
-        rc= MEMCACHED_SOME_ERRORS;
-      }
-    }
-  }
   LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return rc;