d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When we are operating on blocking socket and get EAGAIN on send(2) or recv(2)

Browse Source 
this means that request timed out. Translate the meaningless EAGAIN to
ETIMEDOUT to give administrator a hint that he might need to increase timeout
in configuration file.

MFC after:	1 month
This commit is contained in:
Pawel Jakub Dawidek 2011-04-02 09:29:53 +00:00
parent 02dfe9724c
commit a7ebb3eb8b
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=220272
1 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sbin/hastd/proto_common.c
View File

@ -1,5 +1,6 @@
/*- /*-
* Copyright (c) 2009-2010 The FreeBSD Foundation * Copyright (c) 2009-2010 The FreeBSD Foundation
* Copyright (c) 2011 Pawel Jakub Dawidek <pawel@dawidek.net>
* All rights reserved. * All rights reserved.
* *
* This software was developed by Pawel Jakub Dawidek under sponsorship from * This software was developed by Pawel Jakub Dawidek under sponsorship from
@ -34,8 +35,11 @@ __FBSDID("$FreeBSD$");
#include <sys/socket.h> #include <sys/socket.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h>
#include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <strings.h> #include <strings.h>
#include <unistd.h>
#include "pjdlog.h" #include "pjdlog.h"
#include "proto_impl.h" #include "proto_impl.h"
@ -45,6 +49,16 @@ __FBSDID("$FreeBSD$");
#define MAX_SEND_SIZE 32768 #define MAX_SEND_SIZE 32768
#endif #endif
static bool
blocking_socket(int sock)
{
int flags;
flags = fcntl(sock, F_GETFL);
PJDLOG_ASSERT(flags >= 0);
return ((flags & O_NONBLOCK) == 0);
}
static int static int
proto_descriptor_send(int sock, int fd) proto_descriptor_send(int sock, int fd)
{ {
@ -99,11 +113,19 @@ proto_common_send(int sock, const unsigned char *data, size_t size, int fd)
do { do {
sendsize = size < MAX_SEND_SIZE ? size : MAX_SEND_SIZE; sendsize = size < MAX_SEND_SIZE ? size : MAX_SEND_SIZE;
done = send(sock, data, sendsize, MSG_NOSIGNAL); done = send(sock, data, sendsize, MSG_NOSIGNAL);
if (done == 0) if (done == 0) {
return (ENOTCONN); return (ENOTCONN);
else if (done < 0) { } else if (done < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
/*
* If this is blocking socket and we got EAGAIN, this
* means the request timed out. Translate errno to
* ETIMEDOUT, to give administrator a hint to
* eventually increase timeout.
*/
if (errno == EAGAIN && blocking_socket(sock))
errno = ETIMEDOUT;
return (errno); return (errno);
} }
data += done; data += done;
@ -169,10 +191,19 @@ proto_common_recv(int sock, unsigned char *data, size_t size, int *fdp)
do { do {
done = recv(sock, data, size, MSG_WAITALL); done = recv(sock, data, size, MSG_WAITALL);
} while (done == -1 && errno == EINTR); } while (done == -1 && errno == EINTR);
if (done == 0) if (done == 0) {
return (ENOTCONN); return (ENOTCONN);
else if (done < 0) } else if (done < 0) {
/*
* If this is blocking socket and we got EAGAIN, this
* means the request timed out. Translate errno to
* ETIMEDOUT, to give administrator a hint to
* eventually increase timeout.
*/
if (errno == EAGAIN && blocking_socket(sock))
errno = ETIMEDOUT;
return (errno); return (errno);
}
if (fdp == NULL) if (fdp == NULL)
return (0); return (0);
return (proto_descriptor_recv(sock, fdp)); return (proto_descriptor_recv(sock, fdp));