- /* Create the socket */
- if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
- return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+static memcached_return unix_socket_connect(memcached_server_st *ptr)
+{
+ struct sockaddr_un servAddr;
+ socklen_t addrlen;
+
+ if (ptr->fd == -1)
+ {
+ if ((ptr->fd= socket(AF_UNIX, SOCK_STREAM, 0)) < 0)
+ {
+ ptr->cached_errno= errno;
+ return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
+ }
+
+ memset(&servAddr, 0, sizeof (struct sockaddr_un));
+ servAddr.sun_family= AF_UNIX;
+ strcpy(servAddr.sun_path, ptr->hostname); /* Copy filename */
+
+ addrlen= strlen(servAddr.sun_path) + sizeof(servAddr.sun_family);
+
+test_connect:
+ if (connect(ptr->fd,
+ (struct sockaddr *)&servAddr,
+ sizeof(servAddr)) < 0)
+ {
+ switch (errno) {
+ case EINPROGRESS:
+ case EALREADY:
+ case EINTR:
+ goto test_connect;
+ case EISCONN: /* We were spinning waiting on connect */
+ break;
+ default:
+ WATCHPOINT_ERRNO(errno);
+ ptr->cached_errno= errno;
+ return MEMCACHED_ERRNO;
+ }
+ }
+ }
+ return MEMCACHED_SUCCESS;
+}
+
+static memcached_return network_connect(memcached_server_st *ptr)
+{
+ if (ptr->fd == -1)
+ {
+ struct addrinfo *use;
+
+ /* Old connection junk still is in the structure */
+ WATCHPOINT_ASSERT(ptr->cursor_active == 0);
+
+ if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
+ (!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
+ {
+ memcached_return rc;