X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=516b5db346482e24500854deef4fbc0c4267aef5;hb=151506dd4b5da014f23438226ee286772a78dfd3;hp=5b3644a18b198053620f1974b5b773389689cf9b;hpb=7cbcd28d0e2958df0572d965996a65e22b18e66a;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 5b3644a1..516b5db3 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,8 +1,10 @@
-#include <memcached.h>
+#include "common.h"
 
 memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
 {
-  memcached_host_st *host_ptr, *prev_ptr;
+  memcached_server_st *new_host_list;
+  char *new_hostname;
+  LIBMEMCACHED_MEMCACHED_SERVER_ADD_START();
 
   if (!port)
     port= MEMCACHED_DEFAULT_PORT; 
@@ -10,98 +12,82 @@ memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigne
   if (!hostname)
     hostname= "localhost"; 
 
-  if (ptr->hosts)
-  {
-    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;
-  }
 
-  memset(host_ptr, 0, sizeof(memcached_host_st));
-  host_ptr->hostname= (char *)malloc(sizeof(char) * strlen(hostname));
+  new_host_list= (memcached_server_st *)realloc(ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
+  if (!new_host_list)
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+  memset(&new_host_list[ptr->number_of_hosts], 0, sizeof(memcached_server_st));
+  
+  if (!new_host_list)
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
 
-  if (!host_ptr->hostname)
-  {
-    free(host_ptr);
+  ptr->hosts= new_host_list;
+
+  new_hostname=
+    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
+  if (!new_hostname)
     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-  }
-  memcpy(host_ptr->hostname, hostname, strlen(hostname));
-  host_ptr->port= port;
+
+  memset(new_hostname, 0, strlen(hostname)+1);
+  memcpy(new_hostname, hostname, strlen(hostname));
+  ptr->hosts[ptr->number_of_hosts].hostname= new_hostname;
+  ptr->hosts[ptr->number_of_hosts].port= port;
+  ptr->hosts[ptr->number_of_hosts].fd= -1;
+  ptr->number_of_hosts++;
+
+  LIBMEMCACHED_MEMCACHED_SERVER_ADD_END();
 
   return MEMCACHED_SUCCESS;
 }
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
+  unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
-  memcached_host_st *host_ptr;
 
-  if (ptr->connected)
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
+  if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
   {
-    memcached_return rc;
-    rc= memcached_server_add(ptr, NULL, 0);
-
-    if (rc != MEMCACHED_SUCCESS)
-      return rc;
+    return MEMCACHED_NO_SERVERS;
   }
 
-
-  for (host_ptr= ptr->hosts; host_ptr; host_ptr= host_ptr->next)
+  for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if ((h= gethostbyname(host_ptr->hostname)) == NULL)
+    if (ptr->hosts[x].fd == -1)
     {
-      fprintf(stderr, "unknown host '%s'\n", host_ptr->hostname);
-      return MEMCACHED_HOST_LOCKUP_FAILURE;
-    }
+      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(host_ptr->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[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+        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", host_ptr->port);
-      return(MEMCACHED_CONNECTION_BIND_FAILURE);
-    }
+      if (bind(ptr->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
+        return(MEMCACHED_CONNECTION_BIND_FAILURE);
 
-    /* connect to server */
-    if (connect(ptr->fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 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;
+      /* connect to server */
+      if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+        return MEMCACHED_HOST_LOCKUP_FAILURE;
+
+      ptr->connected++;
     }
   }
-
-  ptr->connected= 1;
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return MEMCACHED_SUCCESS;
 }