Merge of latest - callback commit needed

[m6w6/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index f4c80d5cc53d97e612f318a8694b825c2b7d6957..d3237fa8978509f134a6dfce4878addc1ffc0061 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -12,7 +12,7 @@ static memcached_return set_hostinfo(memcached_server_st *server)
   memset(&hints, 0, sizeof(hints));
   hints.ai_family= AF_INET;
   hints.ai_socktype= SOCK_STREAM;
-  hints.ai_protocol= 0;
+  hints.ai_protocol= IPPROTO_TCP;
 
   e= getaddrinfo(server->hostname, str_port, &hints, &ai);
   if (e != 0)
@@ -77,7 +77,7 @@ static memcached_return udp_connect(memcached_st *ptr, unsigned int server_key)
   if (ptr->hosts[server_key].fd == -1)
   {
     /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
 
     /*
       If we have not allocated the hosts object.
@@ -110,10 +110,11 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
 {
   if (ptr->hosts[server_key].fd == -1)
   {
-    /* Old connection junk still is in the structure */
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
     struct addrinfo *use;
 
+    /* Old connection junk still is in the structure */
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
+
     if (ptr->hosts[server_key].sockaddr_inited == MEMCACHED_NOT_ALLOCATED || 
         (!(ptr->flags & MEM_USE_CACHE_LOOKUPS)))
     {
@@ -136,42 +137,71 @@ static memcached_return tcp_connect(memcached_st *ptr, unsigned int server_key)
       return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
     }
 
-    /* For the moment, not getting a nonblocking mode will not be fatal */
     if (ptr->flags & MEM_NO_BLOCK)
     {
-      int flags;
-
-      flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
-      if (flags != -1)
-      {
-        (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
-
-        flags= 1;
-        setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, SO_LINGER, 
-                   &flags, (socklen_t)sizeof(int));
-      }
+      int error;
+      struct linger linger;
+      struct timeval waittime;
+
+      waittime.tv_sec= 10;
+      waittime.tv_usec= 0;
+
+      linger.l_onoff= 1; 
+      linger.l_linger= MEMCACHED_DEFAULT_TIMEOUT; 
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_LINGER, 
+                        &linger, (socklen_t)sizeof(struct linger));
+      WATCHPOINT_ASSERT(error == 0);
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDTIMEO, 
+                        &waittime, (socklen_t)sizeof(struct timeval));
+      WATCHPOINT_ASSERT(error == 0);
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_RCVTIMEO, 
+                        &waittime, (socklen_t)sizeof(struct timeval));
+      WATCHPOINT_ASSERT(error == 0);
     }
 
     if (ptr->flags & MEM_TCP_NODELAY)
     {
       int flag= 1;
+      int error;
 
-      setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
-                 &flag, (socklen_t)sizeof(int));
+      error= setsockopt(ptr->hosts[server_key].fd, IPPROTO_TCP, TCP_NODELAY, 
+                        &flag, (socklen_t)sizeof(int));
+      WATCHPOINT_ASSERT(error == 0);
     }
 
     if (ptr->send_size)
     {
-      setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
-                 &ptr->send_size, (socklen_t)sizeof(int));
+      int error;
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
+                        &ptr->send_size, (socklen_t)sizeof(int));
+      WATCHPOINT_ASSERT(error == 0);
     }
 
     if (ptr->recv_size)
     {
-      setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
-                 &ptr->recv_size, (socklen_t)sizeof(int));
+      int error;
+
+      error= setsockopt(ptr->hosts[server_key].fd, SOL_SOCKET, SO_SNDBUF, 
+                        &ptr->recv_size, (socklen_t)sizeof(int));
+      WATCHPOINT_ASSERT(error == 0);
+    }
+
+    /* For the moment, not getting a nonblocking mode will not be fatal */
+    if (ptr->flags & MEM_NO_BLOCK)
+    {
+      int flags;
+
+      flags= fcntl(ptr->hosts[server_key].fd, F_GETFL, 0);
+      if (flags != -1)
+      {
+        (void)fcntl(ptr->hosts[server_key].fd, F_SETFL, flags | O_NONBLOCK);
+      }
     }
 
+
     /* connect to server */
 test_connect:
     if (connect(ptr->hosts[server_key].fd, 
@@ -188,12 +218,16 @@ test_connect:
         break;
       default:
         ptr->cached_errno= errno;
+        WATCHPOINT_ASSERT(errno == ECONNREFUSED);
         WATCHPOINT_ERRNO(ptr->cached_errno);
+        close(ptr->hosts[server_key].fd);
+        ptr->hosts[server_key].fd= -1;
         return MEMCACHED_ERRNO;
       }
       ptr->connected++;
     }
-    WATCHPOINT_ASSERT(ptr->hosts[server_key].stack_responses == 0);
+
+    WATCHPOINT_ASSERT(ptr->hosts[server_key].cursor_active == 0);
   }
 
   return MEMCACHED_SUCCESS;