FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid generating the SIGPIPE signal

Browse Source 
Handling the SIGPIPE signal in a library is tricky, because installing a
signal handler does affects the entire application. But we can at least
try to avoid generating the SIGPIPE signal ourselves. On Linux, that
requires the use of the MSG_NOSIGNAL flag, and on Mac and BSD setting
the SO_NOSIGPIPE socket option.
This commit is contained in:
Jef Driesen 2020-04-03 12:19:25 +02:00
parent 4ffd45c126
commit d5dffb70be
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/socket.c
View File

@ -24,6 +24,10 @@
#include "common-private.h" #include "common-private.h"
#include "context-private.h" #include "context-private.h"
#ifndef MSG_NOSIGNAL
#define MSG_NOSIGNAL 0
#endif
dc_status_t dc_status_t
dc_socket_syserror (s_errcode_t errcode) dc_socket_syserror (s_errcode_t errcode)
{ {
@ -106,8 +110,22 @@ dc_socket_open (dc_iostream_t *abstract, int family, int type, int protocol)
goto error; goto error;
} }
#ifdef SO_NOSIGPIPE
int optval = 1;
if (setsockopt(device->fd, SOL_SOCKET, SO_NOSIGPIPE, &optval, sizeof(optval)) != 0) {
s_errcode_t errcode = S_ERRNO;
SYSERROR (abstract->context, errcode);
status = dc_socket_syserror(errcode);
goto error_close;
}
#endif
return DC_STATUS_SUCCESS; return DC_STATUS_SUCCESS;
#ifdef SO_NOSIGPIPE
error_close:
S_CLOSE (device->fd);
#endif
error: error:
dc_socket_exit (abstract->context); dc_socket_exit (abstract->context);
return status; return status;
@ -304,7 +322,7 @@ dc_socket_write (dc_iostream_t *abstract, const void *data, size_t size, size_t
break; // Timeout. break; // Timeout.
} }
s_ssize_t n = send (socket->fd, (const char *) data + nbytes, size - nbytes, 0); s_ssize_t n = send (socket->fd, (const char *) data + nbytes, size - nbytes, MSG_NOSIGNAL);
if (n < 0) { if (n < 0) {
s_errcode_t errcode = S_ERRNO; s_errcode_t errcode = S_ERRNO;
if (errcode == S_EINTR || errcode == S_EAGAIN) if (errcode == S_EINTR || errcode == S_EAGAIN)