add error checking, for command overflow, and short writes

[awesomized/libmemcached] / lib / memcached_connect.c

diff --git a/lib/memcached_connect.c b/lib/memcached_connect.c
index 8a6acdd7e5d5430628d2a49c066ac5ece5ffe281..a0c8737c31df48e6e6b7b98e5549d06344408e42 100644 (file)
--- a/lib/memcached_connect.c
+++ b/lib/memcached_connect.c
@@ -1,50 +1,70 @@
 #include <memcached.h>
 
+memcached_return memcached_server_add(memcached_st *ptr, char *hostname, unsigned int port)
+{
+  if (!port)
+    port= MEMCACHED_DEFAULT_PORT; 
+
+  if (!hostname)
+    hostname= "localhost"; 
+
+
+  ptr->hosts= (memcached_host_st *)realloc(ptr->hosts, sizeof(memcached_host_st) * (ptr->number_of_hosts+1));
+  ptr->hosts[ptr->number_of_hosts].hostname=
+    (char *)malloc(sizeof(char) * (strlen(hostname)+1));
+  memset(ptr->hosts[ptr->number_of_hosts].hostname, 0, strlen(hostname)+1);
+  memcpy(ptr->hosts[ptr->number_of_hosts].hostname, hostname, strlen(hostname));
+  ptr->hosts[ptr->number_of_hosts].port= port;
+  ptr->hosts[ptr->number_of_hosts].fd= -1;
+  ptr->number_of_hosts++;
+
+  return MEMCACHED_SUCCESS;
+}
+
 memcached_return memcached_connect(memcached_st *ptr)
 {
-  int rc;
+  unsigned int x;
   struct sockaddr_in localAddr, servAddr;
   struct hostent *h;
-  char *server_name= "localhost";
 
   if (ptr->connected)
     return MEMCACHED_SUCCESS;
 
-
-  if ((h= gethostbyname(server_name)) == NULL)
+  if (!ptr->hosts)
   {
-    fprintf(stderr, "unknown host '%s'\n", server_name);
-    return MEMCACHED_HOST_LOCKUP_FAILURE;
+    memcached_return rc;
+    rc= memcached_server_add(ptr, NULL, 0);
+
+    if (rc != MEMCACHED_SUCCESS)
+      return rc;
   }
 
-  servAddr.sin_family= h->h_addrtype;
-  memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
-  servAddr.sin_port = htons(MEMCACHED_DEFAULT_PORT);
 
-  /* Create the socket */
-  if ((ptr->fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+  for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    fprintf(stderr, "cannot open socket");
-    return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
-  }
+    if ((h= gethostbyname(ptr->hosts[x].hostname)) == NULL)
+      return MEMCACHED_HOST_LOCKUP_FAILURE;
 
+    servAddr.sin_family= h->h_addrtype;
+    memcpy((char *) &servAddr.sin_addr.s_addr, h->h_addr_list[0], h->h_length);
+    servAddr.sin_port = htons(ptr->hosts[x].port);
 
-  /* bind any port number */
-  localAddr.sin_family = AF_INET;
-  localAddr.sin_addr.s_addr = htonl(INADDR_ANY);
-  localAddr.sin_port = htons(0);
+    /* Create the socket */
+    if ((ptr->hosts[0].fd= socket(AF_INET, SOCK_STREAM, 0)) < 0)
+      return MEMCACHED_CONNECTION_SOCKET_CREATE_FAILURE;
 
-  if (bind(ptr->fd, (struct sockaddr *) &localAddr, sizeof(localAddr)) < 0)
-  {
-    fprintf(stderr, "cannot bind port TCP %u\n", MEMCACHED_DEFAULT_PORT);
-    return(MEMCACHED_CONNECTION_BIND_FAILURE);
-  }
 
-  /* connect to server */
-  if (connect(ptr->fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
-  {
-    fprintf(stderr, "cannot connect to host '%s'\n", server_name);
-    return MEMCACHED_HOST_LOCKUP_FAILURE;
+    /* bind any port number */
+    localAddr.sin_family = AF_INET;
+    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);
+
+    /* connect to server */
+    if (connect(ptr->hosts[0].fd, (struct sockaddr *) &servAddr, sizeof(servAddr)) < 0)
+      return MEMCACHED_HOST_LOCKUP_FAILURE;
   }
 
   ptr->connected= 1;