{
if (ptr == NULL)
{
- ptr= (memcached_server_st *)malloc(sizeof(memcached_server_st));
+ ptr= (memcached_server_st *)calloc(1, sizeof(memcached_server_st));
if (!ptr)
return NULL; /* MEMCACHED_MEMORY_ALLOCATION_FAILURE */
- memset(ptr, 0, sizeof(memcached_server_st));
ptr->is_allocated= true;
}
else
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;
}
{
memcached_quit_server(ptr, 0);
+ if (ptr->cached_server_error)
+ free(ptr->cached_server_error);
+
if (ptr->address_info)
- {
freeaddrinfo(ptr->address_info);
- ptr->address_info= NULL;
- }
if (ptr->is_allocated)
- {
- if (ptr->root && ptr->root->call_free)
- ptr->root->call_free(ptr->root, ptr);
- else
- free(ptr);
- }
+ ptr->root->call_free(ptr->root, ptr);
else
memset(ptr, 0, sizeof(memcached_server_st));
}
*/
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;
- /* TODO We should check return type */
- return memcached_server_create_with(ptr->root, clone,
- ptr->hostname, ptr->port, ptr->weight,
- ptr->type);
+ 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)
+ rv->cached_server_error= strdup(ptr->cached_server_error);
+ }
+
+ return rv;
+
}
memcached_return memcached_server_cursor(memcached_st *ptr,
return NULL;
}
- if ((ptr->flags & MEM_VERIFY_KEY) && (memcachd_key_test((char **)&key, &key_length, 1) == MEMCACHED_BAD_KEY_PROVIDED))
+ 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;
return memcached_server_clone(NULL, &ptr->hosts[server_key]);
}
+
+const char *memcached_server_error(memcached_server_st *ptr)
+{
+ if (ptr)
+ return ptr->cached_server_error;
+ else
+ return NULL;
+}
+
+void memcached_server_error_reset(memcached_server_st *ptr)
+{
+ ptr->cached_server_error[0]= 0;
+}