X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fmemcached_version.c;h=db2419cfab3ef927a38e130348d6ab598bfe906b;hb=a246ac50a88e4af750fd2dd209eff94dcadf72d2;hp=e49d76f0b2e87c8e510ed5e74025f6edc0aa98b8;hpb=26c1a71921b1468d56f6edaa7e6e3855ec1c879f;p=awesomized%2Flibmemcached

diff --git a/libmemcached/memcached_version.c b/libmemcached/memcached_version.c
index e49d76f0..db2419cf 100644
--- a/libmemcached/memcached_version.c
+++ b/libmemcached/memcached_version.c
@@ -5,21 +5,35 @@ const char * memcached_lib_version(void)
   return LIBMEMCACHED_VERSION_STRING;
 }
 
-memcached_return memcached_version(memcached_st *ptr)
+static inline memcached_return_t memcached_version_binary(memcached_st *ptr);
+static inline memcached_return_t memcached_version_textual(memcached_st *ptr);
+
+memcached_return_t memcached_version(memcached_st *ptr)
+{
+  if (ptr->flags.use_udp)
+    return MEMCACHED_NOT_SUPPORTED;
+
+  if (ptr->flags.binary_protocol)
+    return memcached_version_binary(ptr);
+  else
+    return memcached_version_textual(ptr);      
+}
+
+static inline memcached_return_t memcached_version_textual(memcached_st *ptr)
 {
   unsigned int x;
   size_t send_length;
-  memcached_return rc;
+  memcached_return_t rc;
   char buffer[MEMCACHED_DEFAULT_COMMAND_SIZE];
   char *response_ptr;
-  char *command= "version\r\n";
+  const char *command= "version\r\n";
 
   send_length= strlen(command);
 
   rc= MEMCACHED_SUCCESS;
   for (x= 0; x < ptr->number_of_hosts; x++)
   {
-    memcached_return rrc;
+    memcached_return_t rrc;
 
     rrc= memcached_do(&ptr->hosts[x], command, send_length, 1);
     if (rrc != MEMCACHED_SUCCESS)
@@ -30,7 +44,10 @@ memcached_return memcached_version(memcached_st *ptr)
 
     rrc= memcached_response(&ptr->hosts[x], buffer, MEMCACHED_DEFAULT_COMMAND_SIZE, NULL);
     if (rrc != MEMCACHED_SUCCESS)
+    {
       rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
 
     /* Find the space, and then move one past it to copy version */
     response_ptr= index(buffer, ' ');
@@ -47,3 +64,49 @@ memcached_return memcached_version(memcached_st *ptr)
 
   return rc;
 }
+
+static inline memcached_return_t memcached_version_binary(memcached_st *ptr)
+{
+  memcached_return_t rc;
+  unsigned int x;
+  protocol_binary_request_version request= { .bytes= {0}};
+  request.message.header.request.magic= PROTOCOL_BINARY_REQ;
+  request.message.header.request.opcode= PROTOCOL_BINARY_CMD_VERSION;
+  request.message.header.request.datatype= PROTOCOL_BINARY_RAW_BYTES;
+
+  rc= MEMCACHED_SUCCESS;
+  for (x= 0; x < ptr->number_of_hosts; x++) 
+  {
+    memcached_return_t rrc;
+
+    rrc= memcached_do(&ptr->hosts[x], request.bytes, sizeof(request.bytes), 1);
+    if (rrc != MEMCACHED_SUCCESS) 
+    {
+      memcached_io_reset(&ptr->hosts[x]);
+      rc= MEMCACHED_SOME_ERRORS;
+      continue;
+    }
+  }
+
+  for (x= 0; x < ptr->number_of_hosts; x++) 
+    if (memcached_server_response_count(&ptr->hosts[x]) > 0) 
+    {
+      memcached_return_t rrc;
+      char buffer[32];
+      char *p;
+
+      rrc= memcached_response(&ptr->hosts[x], buffer, sizeof(buffer), NULL);
+      if (rrc != MEMCACHED_SUCCESS) 
+      {
+        memcached_io_reset(&ptr->hosts[x]);
+        rc= MEMCACHED_SOME_ERRORS;
+        continue;
+      }
+
+      ptr->hosts[x].major_version= (uint8_t)strtol(buffer, &p, 10);
+      ptr->hosts[x].minor_version= (uint8_t)strtol(p + 1, &p, 10);
+      ptr->hosts[x].micro_version= (uint8_t)strtol(p + 1, NULL, 10);
+    }
+
+  return rc;
+}