Removed more then a handfull of memset() calls.

[awesomized/libmemcached] / lib / memcached_behavior.c

diff --git a/lib/memcached_behavior.c b/lib/memcached_behavior.c
index 1ce495afe336ee27e0d28ef78325afe82e6450f3..fb04d72212fd4ecb1f7ed62a730b08c2785c667a 100644 (file)
--- a/lib/memcached_behavior.c
+++ b/lib/memcached_behavior.c
@@ -32,12 +32,26 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_TCP_NODELAY:
     set_behavior_flag(ptr, MEM_TCP_NODELAY, data);
     break;
-  case MEMCACHED_BEHAVIOR_MD5_HASHING:
-    set_behavior_flag(ptr, MEM_USE_MD5, data);
+  case MEMCACHED_BEHAVIOR_HASH:
+    ptr->hash= *(memcached_hash *)(data);
     break;
   case MEMCACHED_BEHAVIOR_KETAMA:
     set_behavior_flag(ptr, MEM_USE_KETAMA, data);
     break;
+  case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
+    {
+      ptr->send_size= (*((int *)data));
+      memcached_quit(ptr);
+      break;
+    }
+  case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
+    {
+      ptr->recv_size= (*((int *)data));
+      memcached_quit(ptr);
+      break;
+    }
+
+
   }
 
   return MEMCACHED_SUCCESS;
@@ -46,7 +60,7 @@ memcached_return memcached_behavior_set(memcached_st *ptr,
 unsigned long long memcached_behavior_get(memcached_st *ptr, 
                                           memcached_behavior flag)
 {
-  memcached_flags temp_flag;
+  memcached_flags temp_flag= 0;
 
   switch (flag)
   {
@@ -56,14 +70,44 @@ unsigned long long memcached_behavior_get(memcached_st *ptr,
   case MEMCACHED_BEHAVIOR_TCP_NODELAY:
     temp_flag= MEM_TCP_NODELAY;
     break;
-  case MEMCACHED_BEHAVIOR_MD5_HASHING:
-    temp_flag= MEM_USE_MD5;
-    break;
+  case MEMCACHED_BEHAVIOR_HASH:
+    return ptr->hash;
   case MEMCACHED_BEHAVIOR_KETAMA:
     temp_flag= MEM_USE_KETAMA;
     break;
+  case MEMCACHED_BEHAVIOR_SOCKET_SEND_SIZE:
+    {
+      int sock_size;
+      socklen_t sock_length= sizeof(int);
+
+      /* We just try the first host, and if it is down we return zero */
+      if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS)
+        return 0;
+
+      if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET, 
+                     SO_SNDBUF, &sock_size, &sock_length))
+        return 0; /* Zero means error */
+
+      return sock_size;
+    }
+  case MEMCACHED_BEHAVIOR_SOCKET_RECV_SIZE:
+    {
+      int sock_size;
+      socklen_t sock_length= sizeof(int);
+
+      /* We just try the first host, and if it is down we return zero */
+      if ((memcached_connect(ptr, 0)) != MEMCACHED_SUCCESS)
+        return 0;
+
+      if (getsockopt(ptr->hosts[0].fd, SOL_SOCKET, 
+                     SO_RCVBUF, &sock_size, &sock_length))
+        return 0; /* Zero means error */
+
+      return sock_size;
+    }
   }
 
+  WATCHPOINT_ASSERT(temp_flag); /* Programming mistake if it gets this far */
   if (ptr->flags & temp_flag)
     return 1;
   else