Merge in updates for server failure testing.

[awesomized/libmemcached] / libmemcached / server.cc

diff --git a/libmemcached/server.cc b/libmemcached/server.cc
index eda7f847a9c648375c3359b93c6d2a3ca9e2f9f9..022dda4f70be04d891746275c6cbe6318c34b0e1 100644 (file)
--- a/libmemcached/server.cc
+++ b/libmemcached/server.cc
@@ -41,7 +41,8 @@
 #include <libmemcached/common.h>
 
 static inline void _server_init(memcached_server_st *self, memcached_st *root,
-                                const char *hostname, in_port_t port,
+                                const memcached_string_t& hostname,
+                                in_port_t port,
                                 uint32_t weight, memcached_connection_t type)
 {
   self->options.is_shutting_down= false;
@@ -68,26 +69,20 @@ static inline void _server_init(memcached_server_st *self, memcached_st *root,
   self->address_info_next= NULL;
 
   self->state= MEMCACHED_SERVER_STATE_NEW;
+  self->next_retry= 0;
 
+  self->root= root;
   if (root)
   {
-    self->next_retry= root->retry_timeout;
+    self->version= ++root->server_info.version;
   }
   else
   {
-    self->next_retry= 0;
+    self->version= UINT_MAX;
   }
-
-  self->root= root;
   self->limit_maxbytes= 0;
-  if (hostname)
-  {
-    strncpy(self->hostname, hostname, NI_MAXHOST - 1);
-  }
-  else
-  {
-    self->hostname[0]= 0;
-  }
+  memcpy(self->hostname, hostname.c_str, hostname.size);
+  self->hostname[hostname.size]= 0;
 }
 
 static memcached_server_st *_server_create(memcached_server_st *self, const memcached_st *memc)
@@ -97,7 +92,9 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
    self= (memcached_server_st *)libmemcached_malloc(memc, sizeof(memcached_server_st));
 
     if (not self)
+    {
       return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
+    }
 
     self->options.is_allocated= true;
   }
@@ -111,15 +108,25 @@ static memcached_server_st *_server_create(memcached_server_st *self, const memc
   return self;
 }
 
-memcached_server_st *__server_create_with(const memcached_st *memc,
+memcached_server_st *__server_create_with(memcached_st *memc,
                                           memcached_server_write_instance_st self,
-                                          const char *hostname, in_port_t port,
-                                          uint32_t weight, memcached_connection_t type)
+                                          const memcached_string_t& hostname,
+                                          const in_port_t port,
+                                          uint32_t weight, 
+                                          const memcached_connection_t type)
 {
+  if (memcached_is_valid_servername(hostname) == false)
+  {
+    memcached_set_error(*memc, MEMCACHED_INVALID_ARGUMENTS, MEMCACHED_AT, memcached_literal_param("Invalid hostname provided"));
+    return NULL;
+  }
+
   self= _server_create(self, memc);
 
   if (not self)
+  {
     return NULL;
+  }
 
   _server_init(self, const_cast<memcached_st *>(memc), hostname, port, weight, type);
 
@@ -141,6 +148,7 @@ void __server_free(memcached_server_st *self)
   {
     freeaddrinfo(self->address_info);
     self->address_info= NULL;
+    self->address_info_next= NULL;
   }
 
   memcached_error_free(*self);
@@ -173,14 +181,18 @@ void memcached_server_free(memcached_server_st *self)
   If we do not have a valid object to clone from, we toss an error.
 */
 memcached_server_st *memcached_server_clone(memcached_server_st *destination,
-                                            const memcached_server_st *source)
+                                            memcached_server_st *source)
 {
   /* We just do a normal create if source is missing */
   if (not source)
+  {
     return NULL;
+  }
 
+  memcached_string_t hostname= { memcached_string_make_from_cstr(source->hostname) };
   destination= __server_create_with(source->root, destination,
-                                    source->hostname, source->port, source->weight,
+                                    hostname,
+                                    source->port, source->weight,
                                     source->type);
   if (not destination)
   {
@@ -237,7 +249,9 @@ memcached_return_t memcached_server_execute(memcached_st *ptr,
     unsigned int iferror= (*callback)(ptr, instance, context);
 
     if (iferror)
+    {
       continue;
+    }
   }
 
   return MEMCACHED_SUCCESS;
@@ -281,7 +295,9 @@ void memcached_server_error_reset(memcached_server_st *self)
 {
   WATCHPOINT_ASSERT(self);
   if (not self)
+  {
     return;
+  }
 
   memcached_error_free(*self);
 }
@@ -354,10 +370,6 @@ const char *memcached_server_type(const memcached_server_instance_st ptr)
 
     case MEMCACHED_CONNECTION_UNIX_SOCKET:
       return "SOCKET";
-
-    case MEMCACHED_CONNECTION_MAX:
-    case MEMCACHED_CONNECTION_UNKNOWN:
-      break;
     }
   }