X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibmemcached%2Fconnect.cc;h=b71db7179d78a6647eff51afa6f52dd8f6b8a09e;hb=1a15a0895b863a02d598a317f4c0215edef12dc5;hp=04b86f622ee6807a54513fc98532802d260b6b60;hpb=c8a5aecba8e189092266f304ca81ab42625edf60;p=awesomized%2Flibmemcached diff --git a/src/libmemcached/connect.cc b/src/libmemcached/connect.cc index 04b86f62..b71db717 100644 --- a/src/libmemcached/connect.cc +++ b/src/libmemcached/connect.cc @@ -1,6 +1,6 @@ /* +--------------------------------------------------------------------+ - | libmemcached - C/C++ Client Library for memcached | + | libmemcached-awesome - C/C++ Client Library for memcached | +--------------------------------------------------------------------+ | Redistribution and use in source and binary forms, with or without | | modification, are permitted under the terms of the BSD license. | @@ -9,188 +9,53 @@ | the terms online at: https://opensource.org/licenses/BSD-3-Clause | +--------------------------------------------------------------------+ | Copyright (c) 2006-2014 Brian Aker https://datadifferential.com/ | - | Copyright (c) 2020 Michael Wallner | + | Copyright (c) 2020-2021 Michael Wallner https://awesome.co/ | +--------------------------------------------------------------------+ */ #include "libmemcached/common.h" +#include "p9y/poll.hpp" #include -#ifndef SOCK_CLOEXEC -# define SOCK_CLOEXEC 0 -#endif - -#ifndef SOCK_NONBLOCK -# define SOCK_NONBLOCK 0 -#endif - -#ifndef FD_CLOEXEC -# define FD_CLOEXEC 0 -#endif - -#ifndef SO_NOSIGPIPE -# define SO_NOSIGPIPE 0 -#endif - -#ifndef TCP_NODELAY -# define TCP_NODELAY 0 -#endif - -#ifndef TCP_KEEPIDLE -# define TCP_KEEPIDLE 0 -#endif - -static memcached_return_t connect_poll(memcached_instance_st *server, const int connection_error) { - struct pollfd fds[1]; - fds[0].fd = server->fd; - fds[0].events = server->events(); - fds[0].revents = 0; - - size_t loop_max = 5; - - if (server->root->poll_timeout == 0) { - return memcached_set_error( - *server, MEMCACHED_TIMEOUT, MEMCACHED_AT, - memcached_literal_param("The time to wait for a connection to be established was set to " - "zero which produces a timeout to every call to poll().")); - } - - while (--loop_max) // Should only loop on cases of ERESTART or EINTR - { - int number_of; - if ((number_of = poll(fds, 1, server->root->connect_timeout)) == -1) { - int local_errno = get_socket_errno(); // We cache in case closesocket() modifies errno - switch (local_errno) { -#ifdef __linux__ - case ERESTART: -#endif - case EINTR: continue; - - case EFAULT: - case ENOMEM: - return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT); - - case EINVAL: - return memcached_set_error( - *server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, - memcached_literal_param( - "RLIMIT_NOFILE exceeded, or if OSX the timeout value was invalid")); - - default: // This should not happen - break; - } - - assert_msg(server->fd != INVALID_SOCKET, "poll() was passed an invalid file descriptor"); - server->reset_socket(); - server->state = MEMCACHED_SERVER_STATE_NEW; - - return memcached_set_errno(*server, local_errno, MEMCACHED_AT); - } - - if (number_of == 0) { - if (connection_error == EINPROGRESS) { - int err; - socklen_t len = sizeof(err); - if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) { - return memcached_set_errno( - *server, errno, MEMCACHED_AT, - memcached_literal_param( - "getsockopt() error'ed while looking for error connect_poll(EINPROGRESS)")); - } - - // If Zero, my hero, we just fail to a generic MEMCACHED_TIMEOUT error - if (err != 0) { - return memcached_set_errno( - *server, err, MEMCACHED_AT, - memcached_literal_param("getsockopt() found the error from poll() after connect() " - "returned EINPROGRESS.")); - } - } - - return memcached_set_error(*server, MEMCACHED_TIMEOUT, MEMCACHED_AT, - memcached_literal_param("(number_of == 0)")); - } - - assert(number_of == 1); - - if (fds[0].revents & POLLERR or fds[0].revents & POLLHUP or fds[0].revents & POLLNVAL) { - int err; - socklen_t len = sizeof(err); - if (getsockopt(fds[0].fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) { - return memcached_set_errno( - *server, errno, MEMCACHED_AT, - memcached_literal_param( - "getsockopt() errored while looking up error state from poll()")); - } - - // We check the value to see what happened with the socket. - if (err == 0) // Should not happen - { - return MEMCACHED_SUCCESS; - } - errno = err; - - return memcached_set_errno( - *server, err, MEMCACHED_AT, - memcached_literal_param("getsockopt() found the error from poll() during connect.")); - } - assert(fds[0].revents & POLLOUT); - - if (fds[0].revents & POLLOUT and connection_error == EINPROGRESS) { - int err; - socklen_t len = sizeof(err); - if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, (char *) &err, &len) == -1) { - return memcached_set_errno(*server, errno, MEMCACHED_AT); - } - - if (err == 0) { - return MEMCACHED_SUCCESS; - } - - return memcached_set_errno( - *server, err, MEMCACHED_AT, - memcached_literal_param( - "getsockopt() found the error from poll() after connect() returned EINPROGRESS.")); - } - - break; // We only have the loop setup for errno types that require restart - } - - // This should only be possible from ERESTART or EINTR; - return memcached_set_errno(*server, connection_error, MEMCACHED_AT, - memcached_literal_param("connect_poll() was exhausted")); -} - static memcached_return_t set_hostinfo(memcached_instance_st *server) { assert(server->type != MEMCACHED_CONNECTION_UNIX_SOCKET); + assert(server->hostname()); + server->clear_addrinfo(); - char str_port[MEMCACHED_NI_MAXSERV] = {0}; + char str_host[MEMCACHED_NI_MAXHOST] = {0}, str_port[MEMCACHED_NI_MAXSERV] = {0}; errno = 0; - int length = snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port())); - if (length >= MEMCACHED_NI_MAXSERV or length <= 0 or errno != 0) { + + auto length = snprintf(str_port, MEMCACHED_NI_MAXSERV, "%u", uint32_t(server->port())); + if (length <= 0 or errno) { return memcached_set_error(*server, MEMCACHED_MEMORY_ALLOCATION_FAILURE, MEMCACHED_AT, memcached_literal_param("snprintf(NI_MAXSERV)")); } - struct addrinfo hints; - memset(&hints, 0, sizeof(struct addrinfo)); - + struct addrinfo hints{}; hints.ai_family = AF_UNSPEC; if (memcached_is_udp(server->root)) { hints.ai_protocol = IPPROTO_UDP; hints.ai_socktype = SOCK_DGRAM; } else { - hints.ai_socktype = SOCK_STREAM; hints.ai_protocol = IPPROTO_TCP; + hints.ai_socktype = SOCK_STREAM; } - assert(server->address_info == NULL); - assert(server->address_info_next == NULL); - int errcode; - assert(server->hostname()); - switch (errcode = getaddrinfo(server->hostname(), str_port, &hints, &server->address_info)) { + auto hostname = server->hostname(); + if (*hostname == '[') { + auto closing_bracket = &hostname[strlen(hostname) - 1]; + if (*closing_bracket == ']') { + auto host_len = closing_bracket - hostname - 1; + if (host_len < MEMCACHED_NI_MAXHOST) { + hostname = strncpy(str_host, hostname + 1, host_len); + } + } + } + + auto errcode = getaddrinfo(hostname, str_port, &hints, &server->address_info); + switch (errcode) { case 0: server->address_info_next = server->address_info; server->state = MEMCACHED_SERVER_STATE_ADDRINFO; @@ -262,7 +127,7 @@ static bool set_socket_options(memcached_instance_st *server) { #ifdef HAVE_FCNTL // If SOCK_CLOEXEC exists then we don't need to call the following if (SOCK_CLOEXEC == 0) { - if (FD_CLOEXEC != 0) { + if (FD_CLOEXEC) { int flags; do { flags = fcntl(server->fd, F_GETFD, 0); @@ -396,11 +261,11 @@ static memcached_return_t unix_socket_connect(memcached_instance_st *server) { do { int type = SOCK_STREAM; - if (SOCK_CLOEXEC != 0) { + if (SOCK_CLOEXEC) { type |= SOCK_CLOEXEC; } - if (SOCK_NONBLOCK != 0) { + if (SOCK_NONBLOCK) { type |= SOCK_NONBLOCK; } @@ -422,9 +287,13 @@ static memcached_return_t unix_socket_connect(memcached_instance_st *server) { switch (errno) { case EINPROGRESS: case EALREADY: - case EAGAIN: server->events(POLLOUT); break; + case EAGAIN: + server->events(POLLOUT); + break; - case EINTR: server->reset_socket(); continue; + case EINTR: + server->reset_socket(); + continue; case EISCONN: /* We were spinning waiting on connect */ { @@ -477,11 +346,11 @@ static memcached_return_t network_connect(memcached_instance_st *server) { /* Create the socket */ while (server->address_info_next and server->fd == INVALID_SOCKET) { int type = server->address_info_next->ai_socktype; - if (SOCK_CLOEXEC != 0) { + if (SOCK_CLOEXEC) { type |= SOCK_CLOEXEC; } - if (SOCK_NONBLOCK != 0) { + if (SOCK_NONBLOCK) { type |= SOCK_NONBLOCK; } @@ -509,17 +378,20 @@ static memcached_return_t network_connect(memcached_instance_st *server) { /* An error occurred */ int local_error = get_socket_errno(); switch (local_error) { - case ETIMEDOUT: timeout_error_occured = true; break; + case ETIMEDOUT: + timeout_error_occured = true; + break; #if EWOULDBLOCK != EAGAIN case EWOULDBLOCK: #endif + case EAGAIN: case EINPROGRESS: // nonblocking mode - first return case EALREADY: // nonblocking mode - subsequent returns { server->events(POLLOUT); server->state = MEMCACHED_SERVER_STATE_IN_PROGRESS; - memcached_return_t rc = connect_poll(server, local_error); + memcached_return_t rc = memcached_io_poll(server, IO_POLL_CONNECT, local_error); if (memcached_success(rc)) { server->state = MEMCACHED_SERVER_STATE_CONNECTED; @@ -544,7 +416,9 @@ static memcached_return_t network_connect(memcached_instance_st *server) { case ECONNREFUSED: // Probably not running service - default: memcached_set_errno(*server, local_error, MEMCACHED_AT); break; + default: + memcached_set_errno(*server, local_error, MEMCACHED_AT); + break; } WATCHPOINT_ASSERT(server->fd != INVALID_SOCKET); @@ -672,7 +546,8 @@ static memcached_return_t _memcached_connect(memcached_instance_st *server, /* We need to clean up the multi startup piece */ switch (server->type) { case MEMCACHED_CONNECTION_UDP: - case MEMCACHED_CONNECTION_TCP: rc = network_connect(server); + case MEMCACHED_CONNECTION_TCP: + rc = network_connect(server); #if defined(LIBMEMCACHED_WITH_SASL_SUPPORT) if (LIBMEMCACHED_WITH_SASL_SUPPORT) { @@ -687,7 +562,9 @@ static memcached_return_t _memcached_connect(memcached_instance_st *server, #endif break; - case MEMCACHED_CONNECTION_UNIX_SOCKET: rc = unix_socket_connect(server); break; + case MEMCACHED_CONNECTION_UNIX_SOCKET: + rc = unix_socket_connect(server); + break; } if (memcached_success(rc)) {