mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2026-01-06 14:15:29 +01:00
libavformat: use MSG_NOSIGNAL when applicable
If the remote end of a connection oriented socket hangs up, generating an EPIPE error is preferable over an unhandled SIGPIPE signal. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
committed by
Martin Storsjö
parent
b263f8ffe7
commit
6ee1cb5740
@@ -143,7 +143,7 @@ static int ff_sctp_send(int s, const void *msg, size_t len,
|
||||
memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));
|
||||
}
|
||||
|
||||
return sendmsg(s, &outmsg, flags);
|
||||
return sendmsg(s, &outmsg, flags | MSG_NOSIGNAL);
|
||||
}
|
||||
|
||||
typedef struct SCTPContext {
|
||||
@@ -300,7 +300,7 @@ static int sctp_write(URLContext *h, const uint8_t *buf, int size)
|
||||
abort();
|
||||
ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR);
|
||||
} else
|
||||
ret = send(s->fd, buf, size, 0);
|
||||
ret = send(s->fd, buf, size, MSG_NOSIGNAL);
|
||||
|
||||
return ret < 0 ? ff_neterrno() : ret;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user