X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=include%2Fmemcached.h;h=7fd94e7d70abb674b33b5556ed0680b59e32260e;hb=013715211f094bb98ab7ed830b6cd24328641eba;hp=fa2d305cd98e6d4497bf623f715c00d9d83e8675;hpb=d4fe357383d5adbe59dd77108afa92a2b2fc835b;p=awesomized%2Flibmemcached

diff --git a/include/memcached.h b/include/memcached.h
index fa2d305c..7fd94e7d 100644
--- a/include/memcached.h
+++ b/include/memcached.h
@@ -32,7 +32,7 @@ extern "C" {
 #define MEMCACHED_DEFAULT_TIMEOUT INT32_MAX
 
 /* string value */
-#define LIBMEMCACHED_VERSION_STRING "0.16"
+#define LIBMEMCACHED_VERSION_STRING "0.17"
 
 typedef enum {
   MEMCACHED_SUCCESS,
@@ -81,6 +81,8 @@ typedef memcached_return (*memcached_cleanup_func)(memcached_st *ptr);
 typedef void (*memcached_free_function)(memcached_st *ptr, void *mem);
 typedef void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size);
 typedef void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, const size_t size);
+typedef memcached_return (*memcached_execute_function)(memcached_st *ptr, memcached_result_st *result, void *context);
+typedef memcached_return (*memcached_server_function)(memcached_st *ptr, memcached_server_st *server, void *context);
 
 typedef enum {
   MEMCACHED_DISTRIBUTION_MODULA,
@@ -100,6 +102,9 @@ typedef enum {
   MEMCACHED_BEHAVIOR_DISTRIBUTION,
   MEMCACHED_BEHAVIOR_BUFFER_REQUESTS,
   MEMCACHED_BEHAVIOR_USER_DATA,
+  MEMCACHED_BEHAVIOR_SORT_HOSTS,
+  MEMCACHED_BEHAVIOR_VERIFY_KEY,
+  MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT,
 } memcached_behavior;
 
 typedef enum {
@@ -121,6 +126,7 @@ typedef enum {
   MEMCACHED_HASH_FNV1A_32,
   MEMCACHED_HASH_KETAMA,
   MEMCACHED_HASH_HSIEH,
+  MEMCACHED_HASH_MURMUR,
 } memcached_hash;
 
 typedef enum {
@@ -215,6 +221,7 @@ struct memcached_st {
   int send_size;
   int recv_size;
   int32_t poll_timeout;
+  int32_t connect_timeout;
   memcached_result_st result;
   memcached_hash hash;
   memcached_server_distribution distribution;
@@ -405,6 +412,11 @@ void *memcached_callback_get(memcached_st *ptr,
                              memcached_callback flag,
                              memcached_return *error);
 
+memcached_return memcached_server_cursor(memcached_st *ptr, 
+                                         memcached_server_function *callback,
+                                         void *context,
+                                         unsigned int number_of_callbacks);
+
 /* Result Struct */
 void memcached_result_free(memcached_result_st *result);
 memcached_result_st *memcached_result_create(memcached_st *ptr,