X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=899101a2f4199ddf7342aa08e8b692eebfb9a28d;hb=87a14e2b3a9c343e6f012b44887eee978ad351f0;hp=d015c68a2ccf7b42c1d5f05411733afa99d6f001;hpb=ca065f55235fd9979ede818963780f417d70c64e;p=awesomized%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index d015c68a..899101a2 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -2,6 +2,9 @@
 
 memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
 {
+  memcached_server_st *new_host_list;
+  char *new_hostname;
+
   if (!port)
     port= MEMCACHED_DEFAULT_PORT; 
 
@@ -9,11 +12,24 @@ memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigne
     hostname= "localhost"; 
 
 
-  ptr->hosts= (memcached_host_st *)realloc(ptr->hosts, sizeof(memcached_host_st) * (ptr->number_of_hosts+1));
-  ptr->hosts[ptr->number_of_hosts].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;
+
+  ptr->hosts= new_host_list;
+
+  new_hostname=
     (char *)malloc(sizeof(char) * (strlen(hostname)+1));
-  memset(ptr->hosts[ptr->number_of_hosts].hostname, 0, strlen(hostname)+1);
-  memcpy(ptr->hosts[ptr->number_of_hosts].hostname, hostname, strlen(hostname));
+  if (!new_hostname)
+    return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+
+  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++;
@@ -26,63 +42,46 @@ 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)
+  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 (x= 0; x < ptr->number_of_hosts; x++)
   {
-    if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+    if (ptr->hosts[x].fd == -1)
     {
-      fprintf(stderr, "unknown host '%s'\n", ptr->hosts[x].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(ptr->hosts[x].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->hosts[0].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->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
-    {
-      fprintf(stderr, "cannot bind port TCP %u\n", ptr->hosts[x].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->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-    {
-      fprintf(stderr, "cannot connect to host '%s' (%u)  (error: %s)\n", ptr->hosts[x].hostname, 
-              ptr->hosts[x].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;
-
   return MEMCACHED_SUCCESS;
 }