projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Fix for most errors around non-block
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 8c7ef3326332d10c442de800c24430a0e40e4a70..4cd5219afebabb90689bb6c1fcf6e5a749138cb6 100644
(file)
--- a/
libmemcached/memcached_connect.c
+++ b/
libmemcached/memcached_connect.c
@@
-1,4
+1,5
@@
#include "common.h"
#include "common.h"
+#include <netdb.h>
#include <poll.h>
#include <sys/time.h>
#include <poll.h>
#include <sys/time.h>
@@
-13,7
+14,7
@@
static memcached_return set_hostinfo(memcached_server_st *server)
memset(&hints, 0, sizeof(hints));
memset(&hints, 0, sizeof(hints));
- hints.ai_family= AF_INET;
+
//
hints.ai_family= AF_INET;
if (server->type == MEMCACHED_CONNECTION_UDP)
{
hints.ai_protocol= IPPROTO_UDP;
if (server->type == MEMCACHED_CONNECTION_UDP)
{
hints.ai_protocol= IPPROTO_UDP;
@@
-34,7
+35,10
@@
static memcached_return set_hostinfo(memcached_server_st *server)
}
if (server->address_info)
}
if (server->address_info)
+ {
freeaddrinfo(server->address_info);
freeaddrinfo(server->address_info);
+ server->address_info= NULL;
+ }
server->address_info= ai;
return MEMCACHED_SUCCESS;
server->address_info= ai;
return MEMCACHED_SUCCESS;
@@
-172,13
+176,14
@@
static memcached_return network_connect(memcached_server_st *ptr)
{
struct addrinfo *use;
{
struct addrinfo *use;
- if(ptr->root->server_failure_limit != 0) {
- if(ptr->server_failure_counter >= ptr->root->server_failure_limit) {
+ if (ptr->root->server_failure_limit != 0)
+ {
+ if (ptr->server_failure_counter >= ptr->root->server_failure_limit)
+ {
memcached_server_remove(ptr);
memcached_server_remove(ptr);
+ return MEMCACHED_FAILURE;
}
}
}
}
- /* 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)))
if (ptr->sockaddr_inited == MEMCACHED_NOT_ALLOCATED ||
(!(ptr->root->flags & MEM_USE_CACHE_LOOKUPS)))
@@
-229,7
+234,7
@@
test_connect:
{
goto handle_retry;
}
{
goto handle_retry;
}
- else if (error != 1
||
fds[0].revents & POLLERR)
+ else if (error != 1
&&
fds[0].revents & POLLERR)
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
{
ptr->cached_errno= errno;
WATCHPOINT_ERRNO(ptr->cached_errno);
@@
-242,13
+247,13
@@
test_connect:
ptr->address_info= NULL;
}
ptr->address_info= NULL;
}
- if (ptr->root->retry_timeout)
- {
- struct timeval next_time;
+
if (ptr->root->retry_timeout)
+
{
+
struct timeval next_time;
- gettimeofday(&next_time, NULL);
- ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
- }
+
gettimeofday(&next_time, NULL);
+
ptr->next_retry= next_time.tv_sec + ptr->root->retry_timeout;
+
}
ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO;
}
ptr->server_failure_counter+= 1;
return MEMCACHED_ERRNO;
}