See changes in changelog, but...

[m6w6/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 381053950b16540dbc5d05925ebcc87031d369ab..78a7d70337aa560773e50e41c5307f0eb2001689 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,5 +1,10 @@
 #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)
 {
   unsigned int x;
@@ -26,8 +31,11 @@ memcached_return memcached_connect(memcached_st *ptr)
       servAddr.sin_port = htons(ptr->hosts[x].port);
 
       /* Create the socket */
-      if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      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 */
@@ -35,14 +43,42 @@ 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);
+      /* 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);
+      }
+
+      if (ptr->flags & MEM_TCP_NODELAY)
+      {
+        int flag= 1;
+
+        setsockopt(ptr->hosts[x].fd, IPPROTO_TCP, TCP_NODELAY, 
+                   &flag, (socklen_t)sizeof(int));
+      }
 
       /* connect to server */
-      if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+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();