memcached 1.2.6 → 1.2.7

data/ext/libmemcached-0.32/libmemcached/memcached_result.c

@@ -0,0 +1,57 @@
+/* 
+  memcached_result_st are used to internally represent the return values from
+  memcached. We use a structure so that long term as identifiers are added 
+  to memcached we will be able to absorb new attributes without having 
+  to addjust the entire API.
+*/
+#include "common.h"
+
+memcached_result_st *memcached_result_create(memcached_st *memc, 
+                                             memcached_result_st *ptr)
+{
+  /* Saving malloc calls :) */
+  if (ptr)
+    memset(ptr, 0, sizeof(memcached_result_st));
+  else
+  {
+    ptr= memc->call_malloc(memc, sizeof(memcached_result_st));
+
+    if (ptr == NULL)
+      return NULL;
+    ptr->is_allocated= true;
+  }
+
+  ptr->root= memc;
+  memcached_string_create(memc, &ptr->value, 0);
+  WATCHPOINT_ASSERT(ptr->value.string == NULL);
+
+  return ptr;
+}
+
+void memcached_result_reset(memcached_result_st *ptr)
+{
+  ptr->key_length= 0;
+  memcached_string_reset(&ptr->value);
+  ptr->flags= 0;
+  ptr->cas= 0;
+  ptr->expiration= 0;
+}
+
+/*
+  NOTE turn into macro
+*/
+memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length)
+{
+  return memcached_string_append(&ptr->value, value, length);
+}
+
+void memcached_result_free(memcached_result_st *ptr)
+{
+  if (ptr == NULL)
+    return;
+
+  memcached_string_free(&ptr->value);
+
+  if (ptr->is_allocated)
+    free(ptr);
+}

data/ext/libmemcached-0.32/libmemcached/memcached_result.h

@@ -0,0 +1,59 @@
+/*
+ * Summary: Result structure used for libmemcached.
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Brian Aker
+ */
+
+#ifndef __MEMCACHED_RESULT_H__
+#define __MEMCACHED_RESULT_H__
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct memcached_result_st {
+  uint32_t flags;
+  bool is_allocated;
+  time_t expiration;
+  memcached_st *root;
+  size_t key_length;
+  uint64_t cas;
+  memcached_string_st value;
+  char key[MEMCACHED_MAX_KEY];
+  /* Add result callback function */
+};
+
+/* Result Struct */
+LIBMEMCACHED_API
+void memcached_result_free(memcached_result_st *result);
+LIBMEMCACHED_API
+void memcached_result_reset(memcached_result_st *ptr);
+LIBMEMCACHED_API
+memcached_result_st *memcached_result_create(memcached_st *ptr, 
+                                             memcached_result_st *result);
+#define memcached_result_key_value(A) (A)->key
+#define memcached_result_key_length(A) (A)->key_length
+#define memcached_result_string_st(A) ((A)->value)
+#ifdef FIX
+#define memcached_result_value(A) memcached_string_value((A)->value)
+#define memcached_result_length(A) memcached_string_length((A)->value)
+#else
+LIBMEMCACHED_API
+char *memcached_result_value(memcached_result_st *ptr);
+LIBMEMCACHED_API
+size_t memcached_result_length(memcached_result_st *ptr);
+#endif
+#define memcached_result_flags(A) (A)->flags
+#define memcached_result_cas(A) (A)->cas
+LIBMEMCACHED_API
+memcached_return memcached_result_set_value(memcached_result_st *ptr, const char *value, size_t length);
+#define memcached_result_set_flags(A,B) (A)->flags=(B)
+#define memcached_result_set_expiration(A,B) (A)->expiration=(B)
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __MEMCACHED_RESULT_H__ */

data/ext/libmemcached-0.32/libmemcached/memcached_sasl.c

@@ -0,0 +1,225 @@
+#include "common.h"
+
+void memcached_set_sasl_callbacks(memcached_st *ptr,
+                                  const sasl_callback_t *callbacks)
+{
+  ptr->sasl_callbacks= callbacks;
+}
+
+const sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr)
+{
+  return ptr->sasl_callbacks;
+}
+
+/**
+ * Resolve the names for both ends of a connection
+ * @param fd socket to check
+ * @param laddr local address (out)
+ * @param raddr remote address (out)
+ * @return true on success false otherwise (errno contains more info)
+ */
+static bool resolve_names(int fd, char *laddr, char *raddr)
+{
+  char host[NI_MAXHOST];
+  char port[NI_MAXSERV];
+  struct sockaddr_storage saddr;
+  socklen_t salen= sizeof(saddr);
+
+  if ((getsockname(fd, (struct sockaddr *)&saddr, &salen) < 0) ||
+      (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host),
+                   port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV) < 0))
+     return false;
+
+  (void)sprintf(laddr, "%s;%s", host, port);
+  salen= sizeof(saddr);
+
+  if ((getpeername(fd, (struct sockaddr *)&saddr, &salen) < 0) ||
+      (getnameinfo((struct sockaddr *)&saddr, salen, host, sizeof(host),
+                   port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV) < 0))
+    return false;
+
+  (void)sprintf(raddr, "%s;%s", host, port);
+
+  return true;
+}
+
+memcached_return memcached_sasl_authenticate_connection(memcached_server_st *server)
+{
+  memcached_return rc;
+
+  /* SANITY CHECK: SASL can only be used with the binary protocol */
+  unlikely ((server->root->flags & MEM_BINARY_PROTOCOL) == 0)
+    return MEMCACHED_FAILURE;
+
+  /* Try to get the supported mech from the server. Servers without SASL
+   * support will return UNKNOWN COMMAND, so we can just treat that
+   * as authenticated
+   */
+  protocol_binary_request_no_extras request= {
+    .message.header.request= {
+      .magic= PROTOCOL_BINARY_REQ,
+      .opcode= PROTOCOL_BINARY_CMD_SASL_LIST_MECHS
+    }
+  };
+
+  if (memcached_io_write(server, request.bytes,
+			 sizeof(request.bytes), 1) != sizeof(request.bytes))
+    return MEMCACHED_WRITE_FAILURE;
+
+  memcached_server_response_increment(server);
+
+  char mech[MEMCACHED_MAX_BUFFER];
+  rc= memcached_response(server, mech, sizeof(mech), NULL);
+  if (rc != MEMCACHED_SUCCESS)
+  {
+    if (rc == MEMCACHED_PROTOCOL_ERROR)
+      rc= MEMCACHED_SUCCESS;
+
+    return rc;
+  }
+
+  /* set ip addresses */
+  char laddr[NI_MAXHOST + NI_MAXSERV];
+  char raddr[NI_MAXHOST + NI_MAXSERV];
+
+  unlikely (!resolve_names(server->fd, laddr, raddr))
+  {
+    server->cached_errno= errno;
+    return MEMCACHED_ERRNO;
+  }
+
+  sasl_conn_t *conn;
+  int ret= sasl_client_new("memcached", server->hostname, laddr, raddr,
+			   server->root->sasl_callbacks, 0, &conn);
+  if (ret != SASL_OK)
+    return MEMCACHED_AUTH_PROBLEM;
+
+  const char *data;
+  const char *chosenmech;
+  unsigned int len;
+  ret= sasl_client_start(conn, mech, NULL, &data, &len, &chosenmech);
+
+  if (ret != SASL_OK && ret != SASL_CONTINUE)
+  {
+    rc= MEMCACHED_AUTH_PROBLEM;
+    goto end;
+  }
+
+  uint16_t keylen= (uint16_t)strlen(chosenmech);
+  request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SASL_AUTH;
+  request.message.header.request.keylen= htons(keylen);
+  request.message.header.request.bodylen= htonl(len + keylen);
+
+  do {
+    /* send the packet */
+    if (memcached_io_write(server, request.bytes,
+                           sizeof(request.bytes), 0) != sizeof(request.bytes) ||
+        memcached_io_write(server, chosenmech, keylen, 0) != keylen ||
+        memcached_io_write(server, data, len, 1) != (int)len)
+    {
+      rc= MEMCACHED_WRITE_FAILURE;
+      goto end;
+    }
+    memcached_server_response_increment(server);
+
+    /* read the response */
+    rc= memcached_response(server, NULL, 0, NULL);
+    if (rc != MEMCACHED_AUTH_CONTINUE)
+      goto end;
+
+    ret= sasl_client_step(conn, memcached_result_value(&server->root->result),
+                          (unsigned int)memcached_result_length(&server->root->result),
+                          NULL, &data, &len);
+
+    if (ret != SASL_OK && ret != SASL_CONTINUE)
+    {
+      rc= MEMCACHED_AUTH_PROBLEM;
+      goto end;
+    }
+
+    request.message.header.request.opcode= PROTOCOL_BINARY_CMD_SASL_STEP;
+    request.message.header.request.bodylen= htonl(len + keylen);
+  } while (true);
+
+end:
+  /* Release resources */
+  sasl_dispose(&conn);
+
+  return rc;
+}
+
+static int get_username(void *context, int id, const char **result,
+                        unsigned int *len)
+{
+  if (!context || !result || (id != SASL_CB_USER && id != SASL_CB_AUTHNAME))
+    return SASL_BADPARAM;
+
+  *result= context;
+  if (len)
+    *len= (unsigned int)strlen(*result);
+
+  return SASL_OK;
+}
+
+static int get_password(sasl_conn_t *conn, void *context, int id,
+                        sasl_secret_t **psecret)
+{
+  if (!conn || ! psecret || id != SASL_CB_PASS)
+    return SASL_BADPARAM;
+
+  *psecret= context;
+
+  return SASL_OK;
+}
+
+memcached_return memcached_set_sasl_auth_data(memcached_st *ptr,
+                                              const char *username,
+                                              const char *password)
+{
+   if (ptr == NULL || username == NULL ||
+       password == NULL || ptr->sasl_callbacks != NULL)
+     return MEMCACHED_FAILURE;
+
+   sasl_callback_t *cb= ptr->call_calloc(ptr, 4, sizeof(sasl_callback_t));
+   char *name= ptr->call_malloc(ptr, strlen(username) + 1);
+   sasl_secret_t *secret= ptr->call_malloc(ptr, strlen(password) + 1 + sizeof(*secret))
+;
+   if (cb == NULL || name == NULL || secret == NULL)
+   {
+     ptr->call_free(ptr, cb);
+     ptr->call_free(ptr, name);
+     ptr->call_free(ptr, secret);
+     return MEMCACHED_MEMORY_ALLOCATION_FAILURE;
+   }
+
+   secret->len= strlen(password);
+   strcpy((void*)secret->data, password);
+
+   cb[0].id= SASL_CB_USER;
+   cb[0].proc= get_username;
+   cb[0].context= strcpy(name, username);
+   cb[1].id= SASL_CB_AUTHNAME;
+   cb[1].proc= get_username;
+   cb[1].context= name;
+   cb[2].id= SASL_CB_PASS;
+   cb[2].proc= get_password;
+   cb[2].context= secret;
+   cb[3].id= SASL_CB_LIST_END;
+
+   memcached_set_sasl_callbacks(ptr, cb);
+
+   return MEMCACHED_SUCCESS;
+}
+
+memcached_return memcached_destroy_sasl_auth_data(memcached_st *ptr)
+{
+   if (ptr == NULL || ptr->sasl_callbacks == NULL)
+     return MEMCACHED_FAILURE;
+
+   ptr->call_free(ptr, ptr->sasl_callbacks[0].context);
+   ptr->call_free(ptr, ptr->sasl_callbacks[2].context);
+   ptr->call_free(ptr, (void*)ptr->sasl_callbacks);
+   ptr->sasl_callbacks= NULL;
+
+   return MEMCACHED_SUCCESS;
+}

data/ext/libmemcached-0.32/libmemcached/memcached_sasl.h

@@ -0,0 +1,44 @@
+/*
+ * Summary: SASL support for memcached
+ *
+ * Copy: See Copyright for the status of this software.
+ *
+ * Author: Trond Norbye
+ */
+
+#ifndef LIBMEMCACHED_MEMCACHED_SASL_H
+#define LIBMEMCACHED_MEMCACHED_SASL_H
+
+#ifdef LIBMEMCACHED_WITH_SASL_SUPPORT
+#include <sasl/sasl.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+LIBMEMCACHED_API
+void memcached_set_sasl_callbacks(memcached_st *ptr,
+                                  const sasl_callback_t *callbacks);
+
+LIBMEMCACHED_API
+memcached_return  memcached_set_sasl_auth_data(memcached_st *ptr,
+                                               const char *username,
+                                               const char *password);
+
+LIBMEMCACHED_API
+memcached_return memcached_destroy_sasl_auth_data(memcached_st *ptr);
+
+
+LIBMEMCACHED_API
+const sasl_callback_t *memcached_get_sasl_callbacks(memcached_st *ptr);
+
+LIBMEMCACHED_LOCAL
+memcached_return memcached_sasl_authenticate_connection(memcached_server_st *server);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* LIBMEMCACHED_WITH_SASL_SUPPORT */
+
+#endif /* LIBMEMCACHED_MEMCACHED_SASL_H */

data/ext/libmemcached-0.32/libmemcached/memcached_server.c

@@ -0,0 +1,159 @@
+/*
+  This is a partial implementation for fetching/creating memcached_server_st objects.
+*/
+#include "common.h"
+
+memcached_server_st *memcached_server_create(memcached_st *memc, memcached_server_st *ptr)
+{
+  if (ptr == NULL)
+  {
+    ptr= (memcached_server_st *)calloc(1, sizeof(memcached_server_st));
+
+    if (!ptr)
+      return NULL; /*  MEMCACHED_MEMORY_ALLOCATION_FAILURE */
+
+    ptr->is_allocated= true;
+  }
+  else
+    memset(ptr, 0, sizeof(memcached_server_st));
+
+  ptr->root= memc;
+
+  return ptr;
+}
+
+memcached_server_st *memcached_server_create_with(memcached_st *memc, memcached_server_st *host,
+                                                  const char *hostname, unsigned int port,
+                                                  uint32_t weight, memcached_connection type)
+{
+  host= memcached_server_create(memc, host);
+
+  if (host == NULL)
+    return NULL;
+
+  strncpy(host->hostname, hostname, MEMCACHED_MAX_HOST_LENGTH - 1);
+  host->root= memc ? memc : NULL;
+  host->port= port;
+  host->weight= weight;
+  host->fd= -1;
+  host->type= type;
+  host->read_ptr= host->read_buffer;
+  if (memc)
+    host->next_retry= memc->retry_timeout;
+  if (type == MEMCACHED_CONNECTION_UDP)
+  {
+    host->write_buffer_offset= UDP_DATAGRAM_HEADER_LENGTH;
+    memcached_io_init_udp_header(host, 0);
+  }
+
+  return host;
+}
+
+void memcached_server_free(memcached_server_st *ptr)
+{
+  memcached_quit_server(ptr, 0);
+  memcached_server_error_reset(ptr);
+
+  if (ptr->address_info)
+    freeaddrinfo(ptr->address_info);
+
+  if (ptr->is_allocated)
+    ptr->root->call_free(ptr->root, ptr);
+  else
+    memset(ptr, 0, sizeof(memcached_server_st));
+}
+
+/*
+  If we do not have a valid object to clone from, we toss an error.
+*/
+memcached_server_st *memcached_server_clone(memcached_server_st *clone, memcached_server_st *ptr)
+{
+  memcached_server_st *rv= NULL;
+
+  /* We just do a normal create if ptr is missing */
+  if (ptr == NULL)
+    return NULL;
+
+  rv = memcached_server_create_with(ptr->root, clone,
+                                    ptr->hostname, ptr->port, ptr->weight,
+                                    ptr->type);
+  if (rv != NULL)
+  {
+    rv->cached_errno= ptr->cached_errno;
+    if (ptr->cached_server_error) {
+      size_t err_len = strlen(ptr->cached_server_error) + 1;
+      rv->cached_server_error = malloc(err_len);
+      strncpy(rv->cached_server_error, ptr->cached_server_error, err_len);
+    }
+  }
+
+  return rv;
+
+}
+
+memcached_return memcached_server_cursor(memcached_st *ptr,
+                                         memcached_server_function *callback,
+                                         void *context,
+                                         unsigned int number_of_callbacks)
+{
+  unsigned int y;
+
+  for (y= 0; y < ptr->number_of_hosts; y++)
+  {
+    unsigned int x;
+
+    for (x= 0; x < number_of_callbacks; x++)
+    {
+      unsigned int iferror;
+
+      iferror= (*callback[x])(ptr, &ptr->hosts[y], context);
+
+      if (iferror)
+        continue;
+    }
+  }
+
+  return MEMCACHED_SUCCESS;
+}
+
+memcached_server_st *memcached_server_by_key(memcached_st *ptr,  const char *key, size_t key_length, memcached_return *error)
+{
+  uint32_t server_key;
+
+  *error= memcached_validate_key_length(key_length,
+                                        ptr->flags & MEM_BINARY_PROTOCOL);
+  unlikely (*error != MEMCACHED_SUCCESS)
+    return NULL;
+
+  unlikely (ptr->number_of_hosts == 0)
+  {
+    *error= MEMCACHED_NO_SERVERS;
+    return NULL;
+  }
+
+  if ((ptr->flags & MEM_VERIFY_KEY) && (memcached_key_test((const char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+  {
+    *error= MEMCACHED_BAD_KEY_PROVIDED;
+    return NULL;
+  }
+
+  server_key= memcached_generate_hash(ptr, key, key_length);
+
+  return &ptr->hosts[server_key];
+}
+
+const char *memcached_server_error(memcached_server_st *ptr)
+{
+  if (ptr->cached_server_error)
+    return ptr->cached_server_error;
+  else
+    return NULL;
+}
+
+void memcached_server_error_reset(memcached_server_st *ptr)
+{
+  if (ptr->cached_server_error) {
+    free(ptr->cached_server_error);
+    ptr->cached_server_error = 0;
+  }
+}