Skip to content
Snippets Groups Projects
Commit 65b32612 authored by Jean-Damien Durand's avatar Jean-Damien Durand Committed by Steven Murray
Browse files

- [Bug #1586] common/socket_timeout.c & select() protection: fixed using poll... 

- [Bug #1586] common/socket_timeout.c & select() protection: fixed using poll instead of select on Linux
- Revisited tabulation of that file
parent 8cb33b1e
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
mediachanger/castorrmc/common/socket_timeout.c
+ 390
− 336
View file @ 65b32612
......@@ -4,9 +4,14 @@
*/
#ifndef lint
static char sccsid[] = "@(#)$RCSfile: socket_timeout.c,v $ $Revision: 1.20 $ $Date: 2003/04/17 07:22:14 $ CERN IT-PDP/DM Jean-Damien Durand";
static char sccsid[] = "@(#)$RCSfile: socket_timeout.c,v $ $Revision: 1.21 $ $Date: 2003/10/13 04:21:30 $ CERN IT-PDP/DM Jean-Damien Durand";
#endif /* not lint */
#if defined(linux)
#define USE_POLL_INSTEAD_OF_SELECT
/* #define __FD_SETSIZE 65536 */
#endif
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
......@@ -31,6 +36,10 @@ static char sccsid[] = "@(#)$RCSfile: socket_timeout.c,v $ $Revision: 1.20 $ $Da
#include <sys/filio.h>
#endif /* SOLARIS */
#ifdef USE_POLL_INSTEAD_OF_SELECT
#include <poll.h>
#endif
#include "net.h"
#include "serrno.h"
#include "socket_timeout.h"
......@@ -61,425 +70,470 @@ Sigfunc *_netsignal();
#endif
int DLL_DECL netconnect_timeout(fd, addr, addr_size, timeout)
SOCKET fd;
struct sockaddr *addr;
size_t addr_size;
int timeout;
SOCKET fd;
struct sockaddr *addr;
size_t addr_size;
int timeout;
{
int rc, nonblocking;
int rc, nonblocking;
#ifndef _WIN32
Sigfunc *sigpipe; /* Old SIGPIPE handler */
Sigfunc *sigpipe; /* Old SIGPIPE handler */
#endif
#ifndef _WIN32
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
#endif
rc = 0;
if ( timeout >= 0 ) {
nonblocking = 1;
rc = 0;
if ( timeout >= 0 ) {
nonblocking = 1;
#ifndef _WIN32
rc = ioctl(fd,FIONBIO,&nonblocking);
rc = ioctl(fd,FIONBIO,&nonblocking);
#else /* _WIN32 */
rc = ioctlsocket(fd,FIONBIO,&nonblocking);
rc = ioctlsocket(fd,FIONBIO,&nonblocking);
#endif /* _WIN32 */
if ( rc == SOCKET_ERROR ) {
serrno = 0;
}
} else {
nonblocking = 0;
}
if ( rc != -1 ) {
rc = connect(fd,addr,addr_size);
if ( timeout >= 0 ) {
if ( rc == SOCKET_ERROR ) {
serrno = 0;
}
} else {
nonblocking = 0;
}
if ( rc != -1 ) {
rc = connect(fd,addr,addr_size);
if ( timeout >= 0 ) {
#ifndef _WIN32
if ( rc == -1 && errno != EINPROGRESS ) {
serrno = 0;
} else rc = 0;
if ( rc == -1 && errno != EINPROGRESS ) {
serrno = 0;
} else rc = 0;
#else /* _WIN32 */
if ( rc == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK ) {
serrno = 0;
} else rc = 0;
if ( rc == SOCKET_ERROR && WSAGetLastError() != WSAEWOULDBLOCK ) {
serrno = 0;
} else rc = 0;
#endif /* _WIN32 */
} /* timeout >= 0 */
}
if ( timeout >= 0 && rc != -1 ) {
time_t time_start = time(NULL);
int time_elapsed = 0;
for (;;) {
rc = _net_connectable(fd, timeout - time_elapsed);
if ( (rc == -1) && (errno == EINTR) ) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
rc = -1;
serrno = SETIMEDOUT;
break;
}
continue;
} else {
break;
}
}
}
} /* timeout >= 0 */
}
if ( timeout >= 0 && rc != -1 ) {
time_t time_start = time(NULL);
int time_elapsed = 0;
for (;;) {
rc = _net_connectable(fd, timeout - time_elapsed);
if ( (rc == -1) && (errno == EINTR) ) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
rc = -1;
serrno = SETIMEDOUT;
break;
}
continue;
} else {
break;
}
}
}
#ifndef _WIN32
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
#endif
/* Restore blocking socket if connect was successful */
if ( timeout >= 0 && rc == 0 ) {
nonblocking = 0;
/* Restore blocking socket if connect was successful */
if ( timeout >= 0 && rc == 0 ) {
nonblocking = 0;
#ifndef _WIN32
rc = ioctl(fd,FIONBIO,&nonblocking);
rc = ioctl(fd,FIONBIO,&nonblocking);
#else /* _WIN32 */
rc = ioctlsocket(fd,FIONBIO,&nonblocking);
rc = ioctlsocket(fd,FIONBIO,&nonblocking);
#endif /* _WIN32 */
if ( rc == SOCKET_ERROR ) serrno = 0;
}
if ( rc == SOCKET_ERROR ) serrno = 0;
}
return(rc);
return(rc);
}
ssize_t DLL_DECL netread_timeout(fd, vptr, n, timeout)
SOCKET fd;
void *vptr;
ssize_t n;
int timeout;
SOCKET fd;
void *vptr;
ssize_t n;
int timeout;
{
size_t nleft; /* Bytes to read */
ssize_t nread = 0; /* Bytes yet read */
ssize_t flag = 0; /* != 0 means error */
char *ptr = NULL; /* Temp. pointer */
int select_status = 0;
size_t nleft; /* Bytes to read */
ssize_t nread = 0; /* Bytes yet read */
ssize_t flag = 0; /* != 0 means error */
char *ptr = NULL; /* Temp. pointer */
int select_status = 0;
#ifndef _WIN32
Sigfunc *sigpipe; /* Old SIGPIPE handler */
Sigfunc *sigpipe; /* Old SIGPIPE handler */
#endif
time_t time_start;
int time_elapsed;
time_t time_start;
int time_elapsed;
/* If n < 0 it is an app. error */
if (n < 0) {
serrno = EINVAL;
return(-1);
}
/* If n < 0 it is an app. error */
if (n < 0) {
serrno = EINVAL;
return(-1);
}
/* If not timeout, we go to normal function */
if (timeout <= 0) {
return(netread(fd,vptr,(int) n));
}
/* If not timeout, we go to normal function */
if (timeout <= 0) {
return(netread(fd,vptr,(int) n));
}
#ifndef _WIN32
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
#endif
ptr = vptr;
nleft = n;
nread = 0;
time_start = time(NULL);
time_elapsed = 0;
while (nleft > 0) {
if ((select_status = _net_readable(fd, timeout - time_elapsed)) <= 0) {
if (select_status == 0) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
} else if (errno == EINTR) {
/* Interupted */
continue;
} else {
flag = -1;
break;
}
}
if ((nread = recv(fd, ptr, nleft, 0)) < 0) {
if (errno != EINTR) {
/* Error */
flag = -1;
break;
}
/* We continue the loop (recv was just interrupted) */
nread = 0;
} else if (nread == 0) {
/* Should not happen */
/* In such a case netread() returns 0, so do we */
serrno = SECONNDROP;
/* Makes sure we will return zero */
nleft = n;
/* EOF */
break;
} else {
nleft -= nread;
ptr += nread;
}
if (nleft > 0) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
}
}
}
ptr = vptr;
nleft = n;
nread = 0;
time_start = time(NULL);
time_elapsed = 0;
while (nleft > 0) {
if ((select_status = _net_readable(fd, timeout - time_elapsed)) <= 0) {
if (select_status == 0) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
} else if (errno == EINTR) {
/* Interupted */
continue;
} else {
flag = -1;
break;
}
}
if ((nread = recv(fd, ptr, nleft, 0)) < 0) {
if (errno != EINTR) {
/* Error */
flag = -1;
break;
}
/* We continue the loop (recv was just interrupted) */
nread = 0;
} else if (nread == 0) {
/* Should not happen */
/* In such a case netread() returns 0, so do we */
serrno = SECONNDROP;
/* Makes sure we will return zero */
nleft = n;
/* EOF */
break;
} else {
nleft -= nread;
ptr += nread;
}
if (nleft > 0) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
}
}
}
#ifndef _WIN32
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
#endif
if (flag != 0) {
/* Return -1 if error */
return(-1);
}
/* Return the number of bytes read ( >= 0) */
return(n - nleft);
if (flag != 0) {
/* Return -1 if error */
return(-1);
}
/* Return the number of bytes read ( >= 0) */
return(n - nleft);
}
ssize_t DLL_DECL netwrite_timeout(fd, vptr, n, timeout)
SOCKET fd;
void *vptr;
ssize_t n;
int timeout;
SOCKET fd;
void *vptr;
ssize_t n;
int timeout;
{
size_t nleft; /* Bytes to read */
ssize_t nwritten = 0; /* Bytes yet read */
ssize_t flag = 0; /* != 0 means error */
char *ptr = NULL; /* Temp. pointer */
size_t nleft; /* Bytes to read */
ssize_t nwritten = 0; /* Bytes yet read */
ssize_t flag = 0; /* != 0 means error */
char *ptr = NULL; /* Temp. pointer */
#ifndef _WIN32
Sigfunc *sigpipe; /* Old SIGPIPE handler */
Sigfunc *sigpipe; /* Old SIGPIPE handler */
#endif
int select_status = 0;
time_t time_start;
int time_elapsed;
int select_status = 0;
time_t time_start;
int time_elapsed;
/* If n < 0 it is an app. error */
if (n < 0) {
serrno = EINVAL;
return(-1);
}
/* If n < 0 it is an app. error */
if (n < 0) {
serrno = EINVAL;
return(-1);
}
/* If not timeout, we go to normal function */
if (timeout <= 0) {
return(netwrite(fd,vptr,(int) n));
}
/* If not timeout, we go to normal function */
if (timeout <= 0) {
return(netwrite(fd,vptr,(int) n));
}
#ifndef _WIN32
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
/* In any case we catch and trap SIGPIPE */
if ((sigpipe = _netsignal(SIGPIPE, SIG_IGN)) == SIG_ERR) {
return(-1);
}
#endif
ptr = vptr;
nleft = n;
time_start = time(NULL);
time_elapsed = 0;
while (nleft > 0) {
if ((select_status = _net_writable(fd, timeout - time_elapsed)) <= 0) {
if (select_status == 0) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
} else if (errno == EINTR) {
/* Interrupted */
continue;
} else {
flag = -1;
break;
}
}
if ((nwritten = send(fd, ptr, nleft, 0)) <= 0) {
if (errno != EINTR) {
/* Error */
flag = -1;
break;
}
/* We continue the loop (send was just interrupted) */
nwritten = 0;
} else {
nleft -= nwritten;
ptr += nwritten;
}
if (nleft > 0) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
}
}
}
ptr = vptr;
nleft = n;
time_start = time(NULL);
time_elapsed = 0;
while (nleft > 0) {
if ((select_status = _net_writable(fd, timeout - time_elapsed)) <= 0) {
if (select_status == 0) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
} else if (errno == EINTR) {
/* Interrupted */
continue;
} else {
flag = -1;
break;
}
}
if ((nwritten = send(fd, ptr, nleft, 0)) <= 0) {
if (errno != EINTR) {
/* Error */
flag = -1;
break;
}
/* We continue the loop (send was just interrupted) */
nwritten = 0;
} else {
nleft -= nwritten;
ptr += nwritten;
}
if (nleft > 0) {
time_elapsed = (int) (time(NULL) - time_start);
if (time_elapsed >= timeout) {
/* Timeout */
serrno = SETIMEDOUT;
flag = -1;
break;
}
}
}
#ifndef _WIN32
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
/* Restore previous handlers */
_netsignal(SIGPIPE, sigpipe);
#endif
if (flag != 0) {
/* Return -1 if error */
return(-1);
}
/* Return the number of bytes writen ( >= 0) */
return(n - nleft);
if (flag != 0) {
/* Return -1 if error */
return(-1);
}
/* Return the number of bytes writen ( >= 0) */
return(n - nleft);
}
#ifndef _WIN32
Sigfunc *_netsignal(signo, func)
int signo;
Sigfunc *func;
int signo;
Sigfunc *func;
{
struct sigaction act, oact;
int n = 0;
struct sigaction act, oact;
int n = 0;
act.sa_handler = func;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
if (signo == SIGALRM) {
act.sa_handler = func;
sigemptyset(&act.sa_mask);
act.sa_flags = 0;
if (signo == SIGALRM) {
#ifdef SA_INTERRUPT
act.sa_flags |= SA_INTERRUPT; /* SunOS 4.x */
act.sa_flags |= SA_INTERRUPT; /* SunOS 4.x */
#endif
} else {
} else {
#ifdef SA_RESTART
act.sa_flags |= SA_RESTART; /* SVR4, 44BSD */
act.sa_flags |= SA_RESTART; /* SVR4, 44BSD */
#endif
}
n = sigaction(signo, &act, &oact);
if (n < 0) {
return(SIG_ERR);
}
return(oact.sa_handler);
}
n = sigaction(signo, &act, &oact);
if (n < 0) {
return(SIG_ERR);
}
return(oact.sa_handler);
}
#endif
#ifdef USE_POLL_INSTEAD_OF_SELECT
int _net_writable(fd, timeout)
int fd;
int timeout;
int fd;
int timeout;
{
fd_set rset;
struct timeval tv;
FD_ZERO(&rset);
FD_SET(fd,&rset);
tv.tv_sec = timeout;
tv.tv_usec = 0;
/* Will return > 0 if the descriptor is writable */
return(select(fd + 1, NULL, &rset, NULL, &tv));
struct pollfd pollit;
pollit.fd = fd;
pollit.events = POLLOUT;
pollit.revents = 0;
/* Will return > 0 if the descriptor is writable */
return(poll(&pollit,1,timeout*1000));
}
#else
int _net_writable(fd, timeout)
int fd;
int timeout;
{
fd_set rset;
struct timeval tv;
FD_ZERO(&rset);
FD_SET(fd,&rset);
tv.tv_sec = timeout;
tv.tv_usec = 0;
/* Will return > 0 if the descriptor is writable */
return(select(fd + 1, NULL, &rset, NULL, &tv));
}
#endif
#ifdef USE_POLL_INSTEAD_OF_SELECT
int _net_readable(fd, timeout)
int fd;
int timeout;
{
struct pollfd pollit;
pollit.fd = fd;
pollit.events = POLLIN;
pollit.revents = 0;
/* Will return > 0 if the descriptor is readable */
return(poll(&pollit,1,timeout*1000));
}
#else
int _net_readable(fd, timeout)
int fd;
int timeout;
int fd;
int timeout;
{
fd_set rset;
struct timeval tv;
fd_set rset;
struct timeval tv;
FD_ZERO(&rset);
FD_SET(fd,&rset);
FD_ZERO(&rset);
FD_SET(fd,&rset);
tv.tv_sec = timeout;
tv.tv_usec = 0;
tv.tv_sec = timeout;
tv.tv_usec = 0;
/* Will return > 0 if the descriptor is readable */
return(select(fd + 1, &rset, NULL, NULL, &tv));
/* Will return > 0 if the descriptor is readable */
return(select(fd + 1, &rset, NULL, NULL, &tv));
}
#endif
int _net_connectable(fd, timeout)
SOCKET fd;
int timeout;
SOCKET fd;
int timeout;
{
fd_set wset, eset;
struct timeval tv;
int rc, errval, errval_len;
FD_ZERO(&wset);
FD_SET(fd,&wset);
FD_ZERO(&eset);
FD_SET(fd,&eset);
#ifdef USE_POLL_INSTEAD_OF_SELECT
struct pollfd pollit;
#else
fd_set wset, eset;
struct timeval tv;
#endif
int rc, errval, errval_len;
tv.tv_sec = timeout;
tv.tv_usec = 0;
#ifdef USE_POLL_INSTEAD_OF_SELECT
pollit.fd = fd;
pollit.events = POLLOUT;
pollit.revents = 0;
#else
FD_ZERO(&wset);
FD_SET(fd,&wset);
FD_ZERO(&eset);
FD_SET(fd,&eset);
/* Will return > 0 if the descriptor is connected */
rc = select(fd + 1, NULL, &wset, &eset, &tv);
tv.tv_sec = timeout;
tv.tv_usec = 0;
#endif
/*
* Timeout ?
*/
if ( rc == 0 ) {
serrno = SETIMEDOUT;
/* Will return > 0 if the descriptor is connected */
#ifdef USE_POLL_INSTEAD_OF_SELECT
rc = poll(&pollit, 1, timeout * 1000);
#else
rc = select(fd + 1, NULL, &wset, &eset, &tv);
#endif
/*
* Timeout ?
*/
if ( rc == 0 ) {
serrno = SETIMEDOUT;
#if defined(_WIN32)
/*
* Make sure an error value is set
*/
WSASetLastError(WSAETIMEDOUT);
/*
* Make sure an error value is set
*/
WSASetLastError(WSAETIMEDOUT);
#endif /* _WIN32 */
return(-1);
}
/*
* Other error ?
*/
if ( rc < 0 ) {
serrno = 0;
return(-1);
}
/*
* Check if a socket error was reported. Connection errors
* are reported through socket layer errors since the connect is
* non-blocking. In this case, select() has returned a positive
* value indicating that a socket was ready for writing. Note that
* most systems seem to require that one always checks the socket
* error for the connect() completion. Some systems (Windows) sets
* the exception set to indicate that there was an error.
*/
errval_len = sizeof(errval);
if ( getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&errval, (int *)&errval_len) == -1 ) {
serrno = 0;
return(-1);
}
if ( (FD_ISSET(fd,&wset)) && (errval == 0) ) return(0);
/*
* For Windows it may happen that the getsockopt returns zero
* error value despite that the write set has not been set.
* Flag that an error occurred with SECOMERR. On windows we must
* set a valid socket error since WSAGetLastError() might be called.
* A good guess value is connection refused.
*/
if ( errval == 0 ) {
errval = SECOMERR;
return(-1);
}
/*
* Other error ?
*/
if ( rc < 0 ) {
serrno = 0;
return(-1);
}
/*
* Check if a socket error was reported. Connection errors
* are reported through socket layer errors since the connect is
* non-blocking. In this case, select() has returned a positive
* value indicating that a socket was ready for writing. Note that
* most systems seem to require that one always checks the socket
* error for the connect() completion. Some systems (Windows) sets
* the exception set to indicate that there was an error.
*/
errval_len = sizeof(errval);
if ( getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&errval, (int *)&errval_len) == -1 ) {
serrno = 0;
return(-1);
}
#ifdef USE_POLL_INSTEAD_OF_SELECT
if (errval == 0) return(0);
#else
if ( (FD_ISSET(fd,&wset)) && (errval == 0) ) return(0);
/*
* For Windows it may happen that the getsockopt returns zero
* error value despite that the write set has not been set.
* Flag that an error occurred with SECOMERR. On windows we must
* set a valid socket error since WSAGetLastError() might be called.
* A good guess value is connection refused.
*/
if ( errval == 0 ) {
errval = SECOMERR;
#if defined(_WIN32)
/*
* Make sure an error value is set
*/
WSASetLastError(WSAECONNREFUSED);
/*
* Make sure an error value is set
*/
WSASetLastError(WSAECONNREFUSED);
#endif /* _WIN32 */
}
serrno = errval;
return(-1);
}
#endif
serrno = errval;
return(-1);
}
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

imprint | privacy | Conditions of Use