X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fserver.h;h=3ca1df32eddec373f033ac71261bc78937031f29;hb=a60c98bb02391f995a03c3db5898e146ff2f6f3b;hp=dc1121531d422736a033d481b228dce8ff08dbac;hpb=0ae14bed70947882f5ee9423dfcb20eeda7acdd9;p=m6w6%2Flibmemcached diff --git a/libmemcached/server.h b/libmemcached/server.h index dc112153..3ca1df32 100644 --- a/libmemcached/server.h +++ b/libmemcached/server.h @@ -38,11 +38,22 @@ #pragma once +#ifndef WIN32 +#include +#endif + +#ifdef NI_MAXHOST +#define MEMCACHED_NI_MAXHOST NI_MAXHOST +#else +#define MEMCACHED_NI_MAXHOST 1025 +#endif + enum memcached_server_state_t { MEMCACHED_SERVER_STATE_NEW, // fd == -1, no address lookup has been done MEMCACHED_SERVER_STATE_ADDRINFO, // ADDRRESS information has been gathered MEMCACHED_SERVER_STATE_IN_PROGRESS, - MEMCACHED_SERVER_STATE_CONNECTED + MEMCACHED_SERVER_STATE_CONNECTED, + MEMCACHED_SERVER_STATE_IN_TIMEOUT }; struct memcached_server_st { @@ -58,7 +69,9 @@ struct memcached_server_st { memcached_socket_t fd; uint32_t io_bytes_sent; /* # bytes sent since last read */ uint32_t server_failure_counter; + uint64_t server_failure_counter_query_id; uint32_t weight; + uint32_t version; enum memcached_server_state_t state; struct { uint32_t read; @@ -80,7 +93,7 @@ struct memcached_server_st { struct memcached_error_t *error_messages; char read_buffer[MEMCACHED_MAX_BUFFER]; char write_buffer[MEMCACHED_MAX_BUFFER]; - char hostname[NI_MAXHOST]; + char hostname[MEMCACHED_NI_MAXHOST]; };