X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=78a7d70337aa560773e50e41c5307f0eb2001689;hb=a7db49095a0ed78a1418003a00eef6d483c0d854;hp=8a6acdd7e5d5430628d2a49c066ac5ece5ffe281;hpb=1f34771f7ba527e3afb675f1a448d6c5ab66596b;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 8a6acdd7..78a7d703 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,53 +1,87 @@
-#include <memcached.h>
+#include "common.h"
+
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
-  int rc;
+  unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
-  char *server_name= "localhost";
 
-  if (ptr->connected)
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
+  if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
+  if (!ptr->hosts)
+    return MEMCACHED_NO_SERVERS;
 
-  if ((h= gethostbyname(server_name)) == NULL)
+  for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    fprintf(stderr, "unknown host '%s'\n", server_name);
-    return MEMCACHED_HOST_LOCKUP_FAILURE;
-  }
+    if (ptr->hosts[x].fd == -1)
+    {
+      if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+        return MEMCACHED_HOST_LOCKUP_FAILURE;
 
-  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(MEMCACHED_DEFAULT_PORT);
+      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[x].port);
 
-  /* Create the socket */
-  if ((ptr->fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
-  {
-    fprintf(stderr, "cannot open socket");
-    return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
-  }
+      /* Create the socket */
+      if ((ptr->hosts[x].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      {
+        ptr->my_errno= errno;
+        return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+      }
 
 
-  /* bind any port number */
-  localAddr.sin_family = AF_INET;
-  localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  localAddr.sin_port = htons(0);
+      /* bind any port number */
+      localAddr.sin_family = AF_INET;
+      localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
+      localAddr.sin_port = htons(0);
 
-  if (bind(ptr->fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
-  {
-    fprintf(stderr, "cannot bind port TCP %u\n", MEMCACHED_DEFAULT_PORT);
-    return(MEMCACHED_CONNECTION_BIND_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[x].fd, F_GETFL, 0);
+        if (flags != -1)
+          (void)fcntl(ptr->hosts[x].fd, F_SETFL, flags | O_NONBLOCK);
+      }
 
-  /* connect to server */
-  if (connect(ptr->fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-  {
-    fprintf(stderr, "cannot connect to host '%s'\n", server_name);
-    return MEMCACHED_HOST_LOCKUP_FAILURE;
-  }
+      if (ptr->flags & MEM_TCP_NODELAY)
+      {
+        int flag= 1;
 
-  ptr->connected= 1;
+        setsockopt(ptr->hosts[x].fd, IPPROTO_TCP, TCP_NODELAY, 
+                   &flag, (socklen_t)sizeof(int));
+      }
+
+      /* connect to server */
+test_connect:
+      if (connect(ptr->hosts[x].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+      {
+        switch (errno) {
+          /* We are spinning waiting on connect */
+        case EINPROGRESS:
+        case EINTR:
+          goto test_connect;
+        case EISCONN: /* We were spinning waiting on connect */
+          break;
+        default:
+        ptr->my_errno= errno;
+        return MEMCACHED_HOST_LOCKUP_FAILURE;
+      }
+
+      ptr->connected++;
+      }
+    }
+  }
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return MEMCACHED_SUCCESS;
 }