Fixed SASL authentication bits

[m6w6/libmemcached] / libmemcached / memcached.c

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index f7946241919a41df497e7d75f4b254cfd240ec60..81895afab67b19102b9e4418ee1890663cf4128c 100644 (file)
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -5,7 +5,7 @@
  * Use and distribution licensed under the BSD license.  See
  * the COPYING file in the parent directory for full text.
  *
- * Summary: 
+ * Summary:
  *
  */
 
@@ -15,6 +15,7 @@ static const memcached_st global_copy= {
   .state= {
     .is_purging= false,
     .is_processing_input= false,
+    .is_time_for_rebuild= false,
   },
   .flags= {
     .auto_eject_hosts= false,
@@ -32,7 +33,8 @@ static const memcached_st global_copy= {
     .use_cache_lookups= false,
     .use_sort_hosts= false,
     .use_udp= false,
-    .verify_key= false
+    .verify_key= false,
+    .tcp_keepalive= false
   }
 };
 
@@ -62,10 +64,12 @@ static inline bool _memcached_init(memcached_st *self)
   self->io_msg_watermark= 500;
   self->io_bytes_watermark= 65 * 1024;
 
+  self->tcp_keepidle= 0;
+
   self->io_key_prefetch= 0;
   self->cached_errno= 0;
   self->poll_timeout= MEMCACHED_DEFAULT_TIMEOUT;
-  self->connect_timeout= MEMCACHED_DEFAULT_TIMEOUT;
+  self->connect_timeout= MEMCACHED_DEFAULT_CONNECT_TIMEOUT;
   self->retry_timeout= 0;
   self->continuum_count= 0;
 
@@ -88,6 +92,8 @@ static inline bool _memcached_init(memcached_st *self)
   self->get_key_failure= NULL;
   self->delete_trigger= NULL;
   self->callbacks= NULL;
+  self->sasl.callbacks= NULL;
+  self->sasl.is_allocated= false;
 
   return true;
 }
@@ -132,55 +138,52 @@ memcached_st *memcached_create(memcached_st *ptr)
   return ptr;
 }
 
-void server_list_free(memcached_st *ptr, memcached_server_st *servers)
-{
-  uint32_t x;
-
-  if (servers == NULL)
-    return;
-
-  for (x= 0; x < memcached_server_list_count(servers); x++)
-  {
-    if (servers[x].address_info)
-    {
-      freeaddrinfo(servers[x].address_info);
-      servers[x].address_info= NULL;
-    }
-  }
-
-  if (ptr)
-  {
-    libmemcached_free(ptr, servers);
-  }
-  else
-  {
-    free(servers);
-  }
-}
-
 void memcached_servers_reset(memcached_st *ptr)
 {
-  server_list_free(ptr, memcached_server_list(ptr));
+  memcached_server_list_free(memcached_server_list(ptr));
 
   memcached_server_list_set(ptr, NULL);
   ptr->number_of_hosts= 0;
+  if (ptr->last_disconnected_server)
+  {
+    memcached_server_free(ptr->last_disconnected_server);
+  }
   ptr->last_disconnected_server= NULL;
   ptr->server_failure_limit= 0;
 }
 
+void memcached_reset_last_disconnected_server(memcached_st *ptr)
+{
+  if (ptr->last_disconnected_server)
+  {
+    memcached_server_free(ptr->last_disconnected_server);
+    ptr->last_disconnected_server= NULL;
+  }
+}
+
 void memcached_free(memcached_st *ptr)
 {
   /* If we have anything open, lets close it now */
   memcached_quit(ptr);
-  server_list_free(ptr, memcached_server_list(ptr));
+  memcached_server_list_free(memcached_server_list(ptr));
   memcached_result_free(&ptr->result);
 
+  if (ptr->last_disconnected_server)
+    memcached_server_free(ptr->last_disconnected_server);
+
   if (ptr->on_cleanup)
     ptr->on_cleanup(ptr);
 
   if (ptr->continuum)
     libmemcached_free(ptr, ptr->continuum);
 
+  if (ptr->sasl.callbacks)
+  {
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+    memcached_destroy_sasl_auth_data(ptr);
+#endif
+  }
+
   if (memcached_is_allocated(ptr))
   {
     libmemcached_free(ptr, ptr);
@@ -251,6 +254,7 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->io_bytes_watermark= source->io_bytes_watermark;
   new_clone->io_key_prefetch= source->io_key_prefetch;
   new_clone->number_of_replicas= source->number_of_replicas;
+  new_clone->tcp_keepidle= source->tcp_keepidle;
 
   if (memcached_server_count(source))
     rc= memcached_push(new_clone, source);
@@ -269,6 +273,17 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
     new_clone->prefix_key_length= source->prefix_key_length;
   }
 
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  if (source->sasl.callbacks)
+  {
+    if (memcached_clone_sasl(new_clone, source) != MEMCACHED_SUCCESS)
+    {
+      memcached_free(new_clone);
+      return NULL;
+    }
+  }
+#endif
+
   rc= run_distribution(new_clone);
 
   if (rc != MEMCACHED_SUCCESS)
@@ -302,12 +317,12 @@ memcached_return_t memcached_push(memcached_st *destination, const memcached_st
   return memcached_server_push(destination, source->servers);
 }
 
-inline memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
+memcached_server_write_instance_st memcached_server_instance_fetch(memcached_st *ptr, uint32_t server_key)
 {
   return &ptr->servers[server_key];
 }
 
-inline memcached_server_instance_st *memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
+memcached_server_instance_st memcached_server_instance_by_position(const memcached_st *ptr, uint32_t server_key)
 {
   return &ptr->servers[server_key];
 }