lagertonne/yolobs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

New upstream version 23.2.1+dfsg1

Browse source
This commit is contained in:
Simon Chopin 2019-07-27 14:47:10 +02:00
parent cdc9a9fc87
commit b14f9eae6d
1017 changed files with 37232 additions and 11111 deletions
Download patch file Download diff file Expand all files Collapse all files

15
plugins/obs-outputs/librtmp/rtmp.c
View file

@ -34,6 +34,10 @@
#include <util/platform.h>
#if !defined(MSG_NOSIGNAL)
#define MSG_NOSIGNAL 0
#endif
#ifdef CRYPTO
#ifdef __APPLE__
@ -242,8 +246,10 @@ int
RTMPPacket_Alloc(RTMPPacket *p, uint32_t nSize)
{
char *ptr;
#if ARCH_BITS == 32
if (nSize > SIZE_MAX - RTMP_MAX_HEADER_SIZE)
return FALSE;
#endif
ptr = calloc(1, nSize + RTMP_MAX_HEADER_SIZE);
if (!ptr)
@ -928,6 +934,11 @@ RTMP_Connect0(RTMP *r, struct sockaddr * service, socklen_t addrlen)
if (r->m_sb.sb_socket != INVALID_SOCKET)
{
#ifndef _WIN32
#ifdef SO_NOSIGPIPE
setsockopt(r->m_sb.sb_socket, SOL_SOCKET, SO_NOSIGPIPE, &(int){ 1 }, sizeof(int));
#endif
#endif
if(r->m_bindIP.addrLen)
{
if (bind(r->m_sb.sb_socket, (const struct sockaddr *)&r->m_bindIP.addr, r->m_bindIP.addrLen) < 0)
@ -4587,7 +4598,7 @@ RTMPSockBuf_Fill(RTMPSockBuf *sb)
else
#endif
{
nBytes = recv(sb->sb_socket, sb->sb_start + sb->sb_size, nBytes, 0);
nBytes = recv(sb->sb_socket, sb->sb_start + sb->sb_size, nBytes, MSG_NOSIGNAL);
}
if (nBytes > 0)
{
@ -4640,7 +4651,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
else
#endif
{
rc = send(sb->sb_socket, buf, len, 0);
rc = send(sb->sb_socket, buf, len, MSG_NOSIGNAL);
}
return rc;
}