projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
Incomming fix from Chris
[m6w6/libmemcached]
/
libmemcached
/
memcached_connect.c
diff --git
a/libmemcached/memcached_connect.c
b/libmemcached/memcached_connect.c
index 54316c59f90e677eae6752a7bedc45b318adfca0..429e8ec66f581488efbefa920181e31efcea05bb 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>
@@
-45,6
+46,8
@@
static memcached_return set_hostinfo(memcached_server_st *server)
static memcached_return set_socket_options(memcached_server_st *ptr)
{
static memcached_return set_socket_options(memcached_server_st *ptr)
{
+ WATCHPOINT_ASSERT(ptr->fd != -1);
+
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
if (ptr->type == MEMCACHED_CONNECTION_UDP)
return MEMCACHED_SUCCESS;
@@
-166,6
+169,8
@@
test_connect:
}
}
}
}
}
}
+
+ WATCHPOINT_ASSERT(ptr->fd != -1);
return MEMCACHED_SUCCESS;
}
return MEMCACHED_SUCCESS;
}
@@
-183,8
+188,6
@@
static memcached_return network_connect(memcached_server_st *ptr)
return MEMCACHED_FAILURE;
}
}
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)))
@@
-248,13
+251,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;
}