X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached.h;h=a7cdc97722e289e079b79582e4e129cf93965fdf;hb=a8efa12d2d90c3777f3c33347fe002884be1185d;hp=1392cb2bc7efb75303f22895cd6bfc077e459872;hpb=e46e60cc9ede45420b9bebfae61114ad45b39d91;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached.h b/libmemcached/memcached.h
index 1392cb2b..a7cdc977 100644
--- a/libmemcached/memcached.h
+++ b/libmemcached/memcached.h
@@ -53,34 +53,36 @@
 #include <libmemcached/strerror.h>
 #include <libmemcached/verbosity.h>
 #include <libmemcached/version.h>
+#include <libmemcached/sasl.h>
 
 struct memcached_st {
   /**
     @note these are static and should not change without a call to behavior.
   */
   struct {
-    bool is_purging MEMCACHED_BITFIELD;
-    bool is_processing_input MEMCACHED_BITFIELD;
+    bool is_purging:1;
+    bool is_processing_input:1;
+    bool is_time_for_rebuild:1;
   } state;
   struct {
     // Everything below here is pretty static.
-    bool auto_eject_hosts MEMCACHED_BITFIELD;
-    bool binary_protocol MEMCACHED_BITFIELD;
-    bool buffer_requests MEMCACHED_BITFIELD;
-    bool cork MEMCACHED_BITFIELD;
-    bool hash_with_prefix_key MEMCACHED_BITFIELD;
-    bool ketama_weighted MEMCACHED_BITFIELD;
-    bool no_block MEMCACHED_BITFIELD;
-    bool no_reply MEMCACHED_BITFIELD;
-    bool randomize_replica_read MEMCACHED_BITFIELD;
-    bool reuse_memory MEMCACHED_BITFIELD;
-    bool support_cas MEMCACHED_BITFIELD;
-    bool tcp_nodelay MEMCACHED_BITFIELD;
-    bool use_cache_lookups MEMCACHED_BITFIELD;
-    bool use_sort_hosts MEMCACHED_BITFIELD;
-    bool use_udp MEMCACHED_BITFIELD;
-    bool verify_key MEMCACHED_BITFIELD;
-    bool tcp_keepalive MEMCACHED_BITFIELD;
+    bool auto_eject_hosts:1;
+    bool binary_protocol:1;
+    bool buffer_requests:1;
+    bool cork:1;
+    bool hash_with_prefix_key:1;
+    bool ketama_weighted:1;
+    bool no_block:1; // Don't block
+    bool no_reply:1;
+    bool randomize_replica_read:1;
+    bool reuse_memory:1;
+    bool support_cas:1;
+    bool tcp_nodelay:1;
+    bool use_cache_lookups:1;
+    bool use_sort_hosts:1;
+    bool use_udp:1;
+    bool verify_key:1;
+    bool tcp_keepalive:1;
   } flags;
   memcached_server_distribution_t distribution;
   hashkit_st hashkit;
@@ -123,9 +125,10 @@ struct memcached_st {
   memcached_trigger_key_fn get_key_failure;
   memcached_trigger_delete_key_fn delete_trigger;
   memcached_callback_st *callbacks;
+  struct memcached_sasl_st *sasl;
   char prefix_key[MEMCACHED_PREFIX_KEY_MAX_SIZE];
   struct {
-    bool is_allocated MEMCACHED_BITFIELD;
+    bool is_allocated:1;
   } options;
 
 };
@@ -143,6 +146,9 @@ memcached_st *memcached_create(memcached_st *ptr);
 LIBMEMCACHED_API
 void memcached_free(memcached_st *ptr);
 
+LIBMEMCACHED_API
+void memcached_reset_last_disconnected_server(memcached_st *ptr);
+
 LIBMEMCACHED_API
 memcached_st *memcached_clone(memcached_st *clone, const memcached_st *ptr);