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.

Rémi Denis-Courmont committed 12 years ago

Commit 6ee1cb51 parent b263f8f4 files · +8 −4Browse files

Unified · Split

4 files

 };
 #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
 #if !HAVE_STRUCT_ADDRINFO
 struct addrinfo {
     int ai_flags;

@@ -143,7 +143,7 @@ static int ff_sctp_send(int s, const void *msg, size_t len, · 142 unmodified lines
143	memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));	143	memcpy(CMSG_DATA(cmsg), sinfo, sizeof(struct sctp_sndrcvinfo));
144	}	144	}
145		145
146	return sendmsg(s, &outmsg, flags);	146	return sendmsg(s, &outmsg, flags \| MSG_NOSIGNAL);
147	}	147	}
148		148
149	typedef struct SCTPContext {	149	typedef struct SCTPContext {
@@ -300,7 +300,7 @@ static int sctp_write(URLContext h, const uint8_t buf, int size) · 150 unmodified lines
300	abort();	300	abort();
301	ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR);	301	ret = ff_sctp_send(s->fd, buf + 2, size - 2, &info, MSG_EOR);
302	} else	302	} else
303	ret = send(s->fd, buf, size, 0);	303	ret = send(s->fd, buf, size, MSG_NOSIGNAL);
304		304
305	return ret < 0 ? ff_neterrno() : ret;	305	return ret < 0 ? ff_neterrno() : ret;
306	}	306	}

@@ -154,7 +154,7 @@ static int tcp_write(URLContext h, const uint8_t buf, int size) · 153 unmodified lines
154	if (ret < 0)	154	if (ret < 0)
155	return ret;	155	return ret;
156	}	156	}
157	ret = send(s->fd, buf, size, 0);	157	ret = send(s->fd, buf, size, MSG_NOSIGNAL);
158	return ret < 0 ? ff_neterrno() : ret;	158	return ret < 0 ? ff_neterrno() : ret;
159	}	159	}
160		160

@@ -124,7 +124,7 @@ static int unix_write(URLContext h, const uint8_t buf, int size) · 123 unmodified lines
124	if (ret < 0)	124	if (ret < 0)
125	return ret;	125	return ret;
126	}	126	}
127	ret = send(s->fd, buf, size, 0);	127	ret = send(s->fd, buf, size, MSG_NOSIGNAL);
128	return ret < 0 ? ff_neterrno() : ret;	128	return ret < 0 ? ff_neterrno() : ret;
129	}	129	}
130		130

Keyboard shortcuts