Fix for bug in behavior.

[m6w6/libmemcached] / lib / memcached_behavior.c

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index a88bcfcf33f5badb688af1464a3efcc670ee68dd..2fce7d5f100b437fce8fed138170bdd2785ba252 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -1,4 +1,24 @@
-#include <memcached.h>
+#include "common.h" 
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/tcp.h>
+
+/* 
+  This function is used to modify the behabior of running client.
+
+  We quit all connections so we can reset the sockets.
+*/
+
+void set_behavior_flag(memcached_st *ptr, memcached_flags temp_flag, void *data)
+{
+  unsigned int *truefalse= (unsigned int *)data;
+
+  memcached_quit(ptr);
+  if (truefalse)
+    ptr->flags|= temp_flag;
+  else
+    ptr->flags+= temp_flag;
+}
 
 memcached_return memcached_behavior_set(memcached_st *ptr, 
                                         memcached_behavior flag, 
@@ -7,15 +27,41 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   switch (flag)
   {
   case MEMCACHED_BEHAVIOR_NO_BLOCK:
-    /* We quit all connections so we can reset the sockets */
-    memcached_quit(ptr);
-    ptr->flags|= MEM_NO_BLOCK;
+    set_behavior_flag(ptr, MEM_NO_BLOCK, data);
+    break;
+  case MEMCACHED_BEHAVIOR_TCP_NODELAY:
+    set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
     break;
-  case MEMCACHED_BEHAVIOR_BLOCK:
-    /* We quit all connections so we can reset the sockets */
-    memcached_quit(ptr);
-    ptr->flags+= MEM_NO_BLOCK;
+  case MEMCACHED_BEHAVIOR_MD5_HASHING:
+    set_behavior_flag(ptr, MEM_USE_MD5, data);
     break;
+  case MEMCACHED_BEHAVIOR_KETAMA:
+    set_behavior_flag(ptr, MEM_USE_KETAMA, data);
+    break;
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
+unsigned long long memcached_behavior_get(memcached_st *ptr, 
+                                          memcached_behavior flag)
+{
+  memcached_flags temp_flag;
+
+  switch (flag)
+  {
+  case MEMCACHED_BEHAVIOR_NO_BLOCK:
+    temp_flag= MEM_NO_BLOCK;
+  case MEMCACHED_BEHAVIOR_TCP_NODELAY:
+    temp_flag= MEM_TCP_NODELAY;
+  case MEMCACHED_BEHAVIOR_MD5_HASHING:
+    temp_flag= MEM_USE_MD5;
+  case MEMCACHED_BEHAVIOR_KETAMA:
+    temp_flag= MEM_USE_KETAMA;
+    if (ptr->flags & temp_flag)
+      return 1;
+    else
+      return 0;
   }
 
   return MEMCACHED_SUCCESS;