{
int err;
socklen_t len= sizeof (err);
- (void)getsockopt(server->fd, SOL_SOCKET, SO_ERROR, &err, &len);
-
- // We check the value to see what happened wth the socket.
- if (err == 0)
+ if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
{
- return MEMCACHED_SUCCESS;
+ // We check the value to see what happened wth the socket.
+ if (err == 0)
+ {
+ return MEMCACHED_SUCCESS;
+ }
+ errno= err;
}
return memcached_set_errno(*server, err, MEMCACHED_AT);
if (fds[0].revents & POLLERR)
{
int err;
- socklen_t len= sizeof (err);
- (void)getsockopt(server->fd, SOL_SOCKET, SO_ERROR, &err, &len);
- memcached_set_errno(*server, (err == 0) ? get_socket_errno() : err, MEMCACHED_AT);
- }
- else
- {
- memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
+ socklen_t len= sizeof(err);
+ if (getsockopt(server->fd, SOL_SOCKET, SO_ERROR, &err, &len) == 0)
+ {
+ if (err == 0)
+ {
+ // This should never happen, if it does? Punt.
+ continue;
+ }
+ errno= err;
+ }
}
+ int local_errno= get_socket_errno(); // We cache in case closesocket() modifies errno
+
assert_msg(server->fd != INVALID_SOCKET, "poll() was passed an invalid file descriptor");
(void)closesocket(server->fd);
server->fd= INVALID_SOCKET;
server->state= MEMCACHED_SERVER_STATE_NEW;
- return memcached_set_errno(*server, get_socket_errno(), MEMCACHED_AT);
+ return memcached_set_errno(*server, local_errno, MEMCACHED_AT);
}
}
}
#if 0
hints.ai_family= AF_INET;
#endif
- if (server->type == MEMCACHED_CONNECTION_UDP)
+ if (memcached_is_udp(server->root))
{
hints.ai_protocol= IPPROTO_UDP;
hints.ai_socktype= SOCK_DGRAM;
do
{
rval= fcntl(server->fd, F_SETFL, flags | O_NONBLOCK);
- } while (rval == -1 && (errno == EINTR || errno == EAGAIN));
+ } while (rval == -1 && (errno == EINTR or errno == EAGAIN));
- unlikely (rval == -1)
+ if (rval == -1)
{
memcached_set_errno(*server, errno, NULL);
}
{
assert_msg(server->fd != -1, "invalid socket was passed to set_socket_options()");
- if (server->type == MEMCACHED_CONNECTION_UDP)
+ if (memcached_is_udp(server->root))
{
return;
}
while (server->address_info_next and server->fd == INVALID_SOCKET)
{
/* Memcache server does not support IPV6 in udp mode, so skip if not ipv4 */
- if (server->type == MEMCACHED_CONNECTION_UDP && server->address_info_next->ai_family != AF_INET)
+ if (memcached_is_udp(server->root) and server->address_info_next->ai_family != AF_INET)
{
server->address_info_next= server->address_info_next->ai_next;
continue;
return rc;
}
+ if (LIBMEMCACHED_WITH_SASL_SUPPORT and server->root->sasl.callbacks and memcached_is_udp(server->root))
+ {
+ return memcached_set_error(*server, MEMCACHED_INVALID_HOST_PROTOCOL, MEMCACHED_AT, memcached_literal_param("SASL is not supported for UDP connections"));
+ }
+
/* We need to clean up the multi startup piece */
switch (server->type)
{