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

Use MSG_NOSIGNAL with send()

Browse Source 
If the server closes the TCP connection before we call send() in
iscsi_write_to_socket() we will get SIGPIPE unless we pass this
argument to send.

Signed-off-by: Ronnie Sahlberg <ronniesahlberg@gmail.com>
This commit is contained in:
Ronnie Sahlberg
2015-12-06 12:12:49 -08:00
parent 0e0073e818
commit 74fc637eeb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/socket.c
View File

@@ -697,7 +697,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,
0); MSG_NOSIGNAL);
if (count == -1) { if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0; return 0;
@@ -746,7 +746,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, 0); count = send(iscsi->fd, padding_buf, total - pdu->payload_written, MSG_NOSIGNAL);
if (count == -1) { if (count == -1) {
if (errno == EAGAIN || errno == EWOULDBLOCK) { if (errno == EAGAIN || errno == EWOULDBLOCK) {
return 0; return 0;