X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fmemcached_hash.c;h=0e26fbbea44cd1dd40642664e9d1866a73dd658d;hb=1bd637f6eccc1064a4e19e40b14a340818d1ccf3;hp=3e5eddfe55ab332285de495d14080eee7c220aaa;hpb=a95ca4ad9c0f9d23c8a83bd337acdecc221021ef;p=m6w6%2Flibmemcached

diff --git a/lib/memcached_hash.c b/lib/memcached_hash.c
index 3e5eddfe..0e26fbbe 100644
--- a/lib/memcached_hash.c
+++ b/lib/memcached_hash.c
@@ -1,12 +1,41 @@
 #include "common.h"
 
-unsigned int memcached_generate_hash(char *key, size_t key_length)
+/* Prototypes */
+static unsigned int internal_generate_hash(char *key, size_t key_length);
+
+unsigned int memcached_generate_hash(memcached_st *ptr, char *key, size_t key_length)
+{
+  unsigned int hash;
+
+  if (ptr->flags & MEM_USE_MD5)
+  {
+    unsigned char results[16];
+
+    md5_signature((unsigned char*)key, (unsigned int)key_length, results);
+
+    hash= (unsigned int)(( results[3] << 24 )
+				 | ( results[2] << 16 )
+				 | ( results[1] <<  8 )
+				 |   results[0] );
+  }
+  else
+    hash= internal_generate_hash(key, key_length);
+
+  if (ptr->flags & MEM_USE_KETAMA)
+  {
+    WATCHPOINT_ASSERT(0);
+    return 0;
+  }
+  else
+    return hash % ptr->number_of_hosts;
+}
+
+static unsigned int internal_generate_hash(char *key, size_t key_length)
 {
-  unsigned int x = key_length;
-  char *ptr = key;
-  unsigned int value = 0;
+  char *ptr= key;
+  unsigned int value= 0;
 
-  while (x--) 
+  while (--key_length) 
   {
     value += *ptr++;
     value += (value << 10);