#include "common.h"
-memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
-{
- memcached_server_st *new_host_list;
- char *new_hostname;
- LIBMEMCACHED_MEMCACHED_SERVER_ADD_START();
-
- if (!port)
- port= MEMCACHED_DEFAULT_PORT;
-
- if (!hostname)
- hostname= "localhost";
-
-
- new_host_list= (memcached_server_st *)realloc(ptr->hosts, sizeof(memcached_server_st) * (ptr->number_of_hosts+1));
- if (!new_host_list)
- return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
- memset(&new_host_list[ptr->number_of_hosts], 0, sizeof(memcached_server_st));
-
- if (!new_host_list)
- return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
- ptr->hosts= new_host_list;
-
- new_hostname=
- (char *)malloc(sizeof(char) * (strlen(hostname)+1));
- if (!new_hostname)
- return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
-
- memset(new_hostname, 0, strlen(hostname)+1);
- memcpy(new_hostname, hostname, strlen(hostname));
- ptr->hosts[ptr->number_of_hosts].hostname= new_hostname;
- ptr->hosts[ptr->number_of_hosts].port= port;
- ptr->hosts[ptr->number_of_hosts].fd= -1;
- ptr->number_of_hosts++;
-
- LIBMEMCACHED_MEMCACHED_SERVER_ADD_END();
-
- return MEMCACHED_SUCCESS;
-}
+#include <fcntl.h>
memcached_return memcached_connect(memcached_st *ptr)
{
return MEMCACHED_SUCCESS;
if (!ptr->hosts)
- {
return MEMCACHED_NO_SERVERS;
- }
for (x= 0; x < ptr->number_of_hosts; x++)
{
if (ptr->hosts[x].fd == -1)
{
+ int flags;
+
if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
return MEMCACHED_HOST_LOCKUP_FAILURE;
localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
localAddr.sin_port = htons(0);
- if (bind(ptr->hosts[0].fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
- return(MEMCACHED_CONNECTION_BIND_FAILURE);
+#ifdef NOT_YET
+ /* For the moment, not getting a nonblocking mode will note be fatal */
+ flags= fcntl(ptr->hosts[0].fd, F_GETFL, 0);
+ if (flags != -1)
+ (void)fcntl(ptr->hosts[0].fd, F_SETFL, flags | O_NONBLOCK);
+#endif
/* connect to server */
if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)