admin/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

socket: Use alternatives if MSG_NOSIGNAL is unavailable

Browse Source 
Only Linux has MSG_NOSIGNAL as a socket flag (see
http://stackoverflow.com/questions/108183/how-to-prevent-sigpipes-or-handle-them-properly
) which makes compilation fail on other OSes. The BSDs and OS X have
SO_NOSIGPIPE which implements the same thing but others like
Solaris don't even have that (see
http://stackoverflow.com/questions/2205455/detecting-broken-pipe-in-solaris-send-call
)...

Work around this by checking using MSG_NOSIGNAL or SO_NOSIGPIPE if
available otherwise don't set anything at all so we at least continue
to compile.
This commit is contained in:
Sitsofe Wheeler
2016-01-30 07:41:34 +00:00
parent be9b803334
commit 4714e12e8f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/socket.c
View File

@@ -643,6 +643,13 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
size_t total; size_t total;
struct iscsi_pdu *pdu; struct iscsi_pdu *pdu;
static char padding_buf[3]; static char padding_buf[3];
int socket_flags = 0;
#ifdef MSG_NOSIGNAL
socket_flags |= MSG_NOSIGNAL;
#elif SO_NOSIGPIPE
socket_flags |= SO_NOSIGPIPE;
#endif
if (iscsi->fd == -1) { if (iscsi->fd == -1) {
iscsi_set_error(iscsi, "trying to write but not connected"); iscsi_set_error(iscsi, "trying to write but not connected");
@@ -697,7 +704,7 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
count = send(iscsi->fd, count = send(iscsi->fd,
pdu->outdata.data + pdu->outdata_written, pdu->outdata.data + pdu->outdata_written,
pdu->outdata.size - pdu->outdata_written, pdu->outdata.size - pdu->outdata_written,
MSG_NOSIGNAL); socket_flags);
if (count == -1) { if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0; return 0;
@@ -746,7 +753,7 @@ iscsi_write_to_socket(struct iscsi_context *iscsi)
/* Write padding */ /* Write padding */
if (pdu->payload_written < total) { if (pdu->payload_written < total) {
count = send(iscsi->fd, padding_buf, total - pdu->payload_written, MSG_NOSIGNAL); count = send(iscsi->fd, padding_buf, total - pdu->payload_written, socket_flags);
if (count == -1) { if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0; return 0;