X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.c;h=2d28830fa9fe3a24e7cfbbdd70cc31fed77ba814;hb=77688f0ea4e99869438e0e639d19881aee14d5dd;hp=6df260c6acdc9cd6a6c6bc15156f3fd38974e43f;hpb=dac48f2dbe34915755f8f4f7f88419f47dc9e27f;p=m6w6%2Flibmemcached

diff --git a/libmemcached/memcached.c b/libmemcached/memcached.c
index 6df260c6..2d28830f 100644
--- a/libmemcached/memcached.c
+++ b/libmemcached/memcached.c
@@ -1,6 +1,14 @@
-/*
-  Memcached library
-*/
+/* LibMemcached
+ * Copyright (C) 2006-2010 Brian Aker
+ * All rights reserved.
+ *
+ * Use and distribution licensed under the BSD license.  See
+ * the COPYING file in the parent directory for full text.
+ *
+ * Summary:
+ *
+ */
+
 #include "common.h"
 
 static const memcached_st global_copy= {
@@ -80,6 +88,10 @@ static inline bool _memcached_init(memcached_st *self)
   self->get_key_failure= NULL;
   self->delete_trigger= NULL;
   self->callbacks= NULL;
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  self->sasl.callbacks= NULL;
+  self->sasl.is_allocated= false;
+#endif
 
   return true;
 }
@@ -124,35 +136,9 @@ 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_servers_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;
@@ -164,7 +150,7 @@ 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->on_cleanup)
@@ -173,6 +159,13 @@ void memcached_free(memcached_st *ptr)
   if (ptr->continuum)
     libmemcached_free(ptr, ptr->continuum);
 
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+  if (ptr->sasl.callbacks != NULL)
+  {
+    memcached_destroy_sasl_auth_data(ptr);
+  }
+#endif
+
   if (memcached_is_allocated(ptr))
   {
     libmemcached_free(ptr, ptr);
@@ -244,8 +237,8 @@ memcached_st *memcached_clone(memcached_st *clone, const memcached_st *source)
   new_clone->io_key_prefetch= source->io_key_prefetch;
   new_clone->number_of_replicas= source->number_of_replicas;
 
-  if (memcached_server_list(source))
-    rc= memcached_server_push(new_clone, memcached_server_list(source));
+  if (memcached_server_count(source))
+    rc= memcached_push(new_clone, source);
 
   if (rc != MEMCACHED_SUCCESS)
   {
@@ -261,6 +254,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)
@@ -288,3 +292,18 @@ void *memcached_set_user_data(memcached_st *ptr, void *data)
 
   return ret;
 }
+
+memcached_return_t memcached_push(memcached_st *destination, const memcached_st *source)
+{
+  return memcached_server_push(destination, source->servers);
+}
+
+inline 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)
+{
+  return &ptr->servers[server_key];
+}