X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_connect.c;h=278f9da3292710d91a553491b235c9e3606d8ece;hb=b1daf61bf1665041f30fff7c96d61de4658f8db3;hp=5b3644a18b198053620f1974b5b773389689cf9b;hpb=7cbcd28d0e2958df0572d965996a65e22b18e66a;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 5b3644a1..278f9da3 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,107 +1,270 @@
-#include <memcached.h>
+#include "common.h"
 
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
+static memcached_return set_hostinfo(memcached_server_st *server)
 {
-  memcached_host_st *host_ptr, *prev_ptr;
+  struct addrinfo *ai;
+  struct addrinfo hints;
+  int e;
+  char str_port[NI_MAXSERV];
 
-  if (!port)
-    port= MEMCACHED_DEFAULT_PORT; 
+  sprintf(str_port, "%u", server->port);
 
-  if (!hostname)
-    hostname= "localhost"; 
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_socktype= SOCK_STREAM;
+  hints.ai_protocol= 0;
 
-  if (ptr->hosts)
+  e= getaddrinfo(server->hostname, str_port, &hints, &ai);
+  if (e != 0)
   {
-    for (host_ptr= ptr->hosts; host_ptr; host_ptr= host_ptr->next)
-      prev_ptr= host_ptr;
-    host_ptr= (memcached_host_st *)malloc(sizeof(memcached_host_st));
-    if (!host_ptr)
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-    prev_ptr->next= host_ptr;
-  }
-  else
-  {
-    ptr->hosts=
-      host_ptr= (memcached_host_st *)malloc(sizeof(memcached_host_st));
-    if (!host_ptr)
-      return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+    WATCHPOINT_STRING(server->hostname);
+    WATCHPOINT_STRING(gai_strerror(e));
+    return MEMCACHED_HOST_LOOKUP_FAILURE;
   }
 
-  memset(host_ptr, 0, sizeof(memcached_host_st));
-  host_ptr->hostname= (char *)malloc(sizeof(char) * strlen(hostname));
+  if (server->address_info)
+    freeaddrinfo(server->address_info);
+  server->address_info= ai;
+
+  return MEMCACHED_SUCCESS;
+}
 
-  if (!host_ptr->hostname)
+static memcached_return unix_socket_connect(memcached_st *ptr, unsigned int server_key)
+{
+  struct sockaddr_un servAddr;
+  socklen_t addrlen;
+
+  if (ptr->hosts[server_key].fd == -1)
   {
-    free(host_ptr);
-    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-  memcpy(host_ptr->hostname, hostname, strlen(hostname));
-  host_ptr->port= port;
+    if ((ptr->hosts[server_key].fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+    {
+      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); /* Copy filename */
+
+    addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
 
+test_connect:
+    if (connect(ptr->hosts[server_key].fd, 
+                (struct sockaddr *)&servAddr,
+                sizeof(servAddr)) < 0)
+    {
+      switch (errno) {
+        /* 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:
+        WATCHPOINT_ERRNO(errno);
+        ptr->cached_errno= errno;
+        return MEMCACHED_ERRNO;
+      }
+      ptr->connected++;
+    }
+  }
   return MEMCACHED_SUCCESS;
 }
 
-memcached_return memcached_connect(memcached_st *ptr)
+static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
 {
-  struct sockaddr_in localAddr, servAddr;
-  struct hostent *h;
-  memcached_host_st *host_ptr;
+  if (ptr->hosts[server_key].fd == -1)
+  {
+    /* Old connection junk still is in the structure */
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
 
-  if (ptr->connected)
-    return MEMCACHED_SUCCESS;
+    /*
+      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)
-  {
-    memcached_return rc;
-    rc= memcached_server_add(ptr, NULL, 0);
+      rc= set_hostinfo(&ptr->hosts[server_key]);
+      if (rc != MEMCACHED_SUCCESS)
+        return rc;
+
+      ptr->hosts[server_key].sockaddr_inited= MEMCACHED_ALLOCATED;
+    }
 
-    if (rc != MEMCACHED_SUCCESS)
-      return rc;
+    /* 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;
+}
 
-  for (host_ptr= ptr->hosts; host_ptr; host_ptr= host_ptr->next)
+static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
+{
+  if (ptr->hosts[server_key].fd == -1)
   {
-    if ((h= gethostbyname(host_ptr->hostname)) == NULL)
+    struct addrinfo *use;
+
+    /* Old connection junk still is in the structure */
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
+    if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
+        (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
     {
-      fprintf(stderr, "unknown host '%s'\n", host_ptr->hostname);
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
-    }
+      memcached_return rc;
 
-    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(host_ptr->port);
+      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->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)
     {
-      fprintf(stderr, "cannot open socket");
+      ptr->cached_errno= errno;
+      WATCHPOINT_ERRNO(errno);
       return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
     }
 
+    if (ptr->flags & MEM_NO_BLOCK)
+    {
+      int error;
+      struct linger linger;
+      struct timeval waittime;
 
-    /* bind any port number */
-    localAddr.sin_family = AF_INET;
-    localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-    localAddr.sin_port = htons(0);
+      waittime.tv_sec= 10;
+      waittime.tv_usec= 0;
 
-    if (bind(ptr->fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 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)
     {
-      fprintf(stderr, "cannot bind port TCP %u\n", host_ptr->port);
-      return(MEMCACHED_CONNECTION_BIND_FAILURE);
+      int flag= 1;
+      int error;
+
+      error= setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
+                        &flag, (socklen_t)sizeof(int));
+      WATCHPOINT_ASSERT(error == 0);
+    }
+
+    if (ptr->send_size)
+    {
+      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)
+    {
+      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 */
-    if (connect(ptr->fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+test_connect:
+    if (connect(ptr->hosts[server_key].fd, 
+                use->ai_addr, 
+                use->ai_addrlen) < 0)
     {
-      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", host_ptr->hostname, 
-              host_ptr->port,
-              strerror(errno));
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
+      switch (errno) {
+        /* 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;
+        WATCHPOINT_ERRNO(ptr->cached_errno);
+        close(ptr->hosts[server_key].fd);
+        ptr->hosts[server_key].fd= -1;
+        return MEMCACHED_ERRNO;
+      }
+      ptr->connected++;
     }
-  }
 
-  ptr->connected= 1;
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+  }
 
   return MEMCACHED_SUCCESS;
 }
+
+
+memcached_return memcached_connect(memcached_st *ptr, unsigned int server_key)
+{
+  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 */
+  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);
+
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
+
+  return rc;
+}