X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=lib%2Fmemcached_connect.c;h=2120db5c7b4e3d3a5f5aa8bde378490bbf6c765f;hb=3529e69b4a637b6875d82cb22a250d8abc6e8e85;hp=899101a2f4199ddf7342aa08e8b692eebfb9a28d;hpb=806525899ce3dff894b829416307a4290cd882e2;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 899101a2..2120db5c 100644
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,41 +1,6 @@
-#include <memcached.h>
+#include "common.h"
 
-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; 
-
-  if (!hostname)
-    hostname= "localhost"; 
-
-
-  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));
-  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++;
-
-  return MEMCACHED_SUCCESS;
-}
+#include <fcntl.h>
 
 memcached_return memcached_connect(memcached_st *ptr)
 {
@@ -43,18 +8,20 @@ memcached_return memcached_connect(memcached_st *ptr)
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
 
+  LIBMEMCACHED_MEMCACHED_CONNECT_START();
+
   if (ptr->connected == ptr->number_of_hosts)
     return MEMCACHED_SUCCESS;
 
   if (!ptr->hosts)
-  {
     return MEMCACHED_NO_SERVERS;
-  }
 
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
     if (ptr->hosts[x].fd == -1)
     {
+      int flags;
+      
       if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
         return MEMCACHED_HOST_LOCKUP_FAILURE;
 
@@ -72,8 +39,12 @@ memcached_return memcached_connect(memcached_st *ptr)
       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)
-        return(MEMCACHED_CONNECTION_BIND_FAILURE);
+#ifdef NOT_YET
+      /* For the moment, not getting a nonblocking mode will note be fatal */
+      flags= fcntl(ptr->hosts[0].fd, F_GETFL, 0);
+      if (flags != -1)
+        (void)fcntl(ptr->hosts[0].fd, F_SETFL, flags | O_NONBLOCK);
+#endif
 
       /* connect to server */
       if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
@@ -82,6 +53,7 @@ memcached_return memcached_connect(memcached_st *ptr)
       ptr->connected++;
     }
   }
+  LIBMEMCACHED_MEMCACHED_CONNECT_END();
 
   return MEMCACHED_SUCCESS;
 }