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;
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.
{
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)))
{
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);
- }
- }
-
if (ptr->flags & MEM_NO_BLOCK)
{
int error;
struct linger linger;
+ struct timeval waittime;
+
+ waittime.tv_sec= 10;
+ waittime.tv_usec= 0;
linger.l_onoff= 1;
- linger.l_linger= 400;
+ 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)
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,
default:
ptr->cached_errno= errno;
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;