Cleanup's for Tim. Also dropping support back to ipv4 only while I find out

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 278f9da3292710d91a553491b235c9e3606d8ece..d3237fa8978509f134a6dfce4878addc1ffc0061 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -10,8 +10,9 @@ static memcached_return set_hostinfo(memcached_server_st *server)
   sprintf(str_port, "%u", server->port);
 
   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)
@@ -217,6 +218,7 @@ 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;