[origin] Bump up to 2023.03.30 [109.5.2]

(cherry picked from commit 3929b9d)
melchi45 · Apr 25, 2023 · f1b2ef6 · f1b2ef6
1 parent 32cf88a
commit f1b2ef6
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 15 deletions.
diff --git a/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh b/BasicUsageEnvironment/include/BasicUsageEnvironment_version.hh
@@ -19,7 +19,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 #ifndef _BASICUSAGEENVIRONMENT_VERSION_HH
 #define _BASICUSAGEENVIRONMENT_VERSION_HH
 
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2023.01.19"
-#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1674086400
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2023.03.30"
+#define BASICUSAGEENVIRONMENT_LIBRARY_VERSION_INT		1680134400
 
 #endif
diff --git a/UsageEnvironment/include/UsageEnvironment_version.hh b/UsageEnvironment/include/UsageEnvironment_version.hh
@@ -19,7 +19,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 #ifndef _USAGEENVIRONMENT_VERSION_HH
 #define _USAGEENVIRONMENT_VERSION_HH
 
-#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2023.01.19"
-#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1674086400
+#define USAGEENVIRONMENT_LIBRARY_VERSION_STRING	"2023.03.30"
+#define USAGEENVIRONMENT_LIBRARY_VERSION_INT		1680134400
 
 #endif
diff --git a/config.linux-with-shared-libraries b/config.linux-with-shared-libraries
@@ -4,7 +4,7 @@
 # One or more interfaces were added, but no existing interfaces were changed or removed => CURRENT += 1; REVISION = 0; AGE += 1
 
 libliveMedia_VERSION_CURRENT=109
-libliveMedia_VERSION_REVISION=4
+libliveMedia_VERSION_REVISION=5
 libliveMedia_VERSION_AGE=2
 libliveMedia_LIB_SUFFIX=so.$(shell expr $(libliveMedia_VERSION_CURRENT) - $(libliveMedia_VERSION_AGE)).$(libliveMedia_VERSION_AGE).$(libliveMedia_VERSION_REVISION)
 
@@ -19,7 +19,7 @@ libUsageEnvironment_VERSION_AGE=1
 libUsageEnvironment_LIB_SUFFIX=so.$(shell expr $(libUsageEnvironment_VERSION_CURRENT) - $(libUsageEnvironment_VERSION_AGE)).$(libUsageEnvironment_VERSION_AGE).$(libUsageEnvironment_VERSION_REVISION)
 
 libgroupsock_VERSION_CURRENT=31
-libgroupsock_VERSION_REVISION=11
+libgroupsock_VERSION_REVISION=12
 libgroupsock_VERSION_AGE=1
 libgroupsock_LIB_SUFFIX=so.$(shell expr $(libgroupsock_VERSION_CURRENT) - $(libgroupsock_VERSION_AGE)).$(libgroupsock_VERSION_AGE).$(libgroupsock_VERSION_REVISION)
 #####

diff --git a/groupsock/GroupsockHelper.cpp b/groupsock/GroupsockHelper.cpp
@@ -449,7 +449,7 @@ Boolean writeSocket(UsageEnvironment& env,
 		    unsigned char* buffer, unsigned bufferSize) {
   do {
     SOCKLEN_T dest_len = addressSize(addressAndPort);
-    int bytesSent = sendto(socket, (char*)buffer, bufferSize, 0,
+    int bytesSent = sendto(socket, (char*)buffer, bufferSize, MSG_NOSIGNAL,
 			   (struct sockaddr const*)&addressAndPort, dest_len);
     if (bytesSent != (int)bufferSize) {
       char tmpBuf[100];

diff --git a/groupsock/include/GroupsockHelper.hh b/groupsock/include/GroupsockHelper.hh
@@ -25,6 +25,10 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 #include "NetAddress.hh"
 #endif
 
+#ifndef MSG_NOSIGNAL
+#define MSG_NOSIGNAL 0
+#endif
+
 LIVEMEDIA_API int setupDatagramSocket(UsageEnvironment& env, Port port, int domain);
 LIVEMEDIA_API int setupStreamSocket(UsageEnvironment& env, Port port, int domain,
 		      Boolean makeNonBlocking = True, Boolean setKeepAlive = False);

diff --git a/groupsock/include/groupsock_version.hh b/groupsock/include/groupsock_version.hh
@@ -19,7 +19,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 #ifndef _GROUPSOCK_VERSION_HH
 #define _GROUPSOCK_VERSION_HH
 
-#define GROUPSOCK_LIBRARY_VERSION_STRING	"2023.01.19"
-#define GROUPSOCK_LIBRARY_VERSION_INT		1674086400
+#define GROUPSOCK_LIBRARY_VERSION_STRING	"2023.03.30"
+#define GROUPSOCK_LIBRARY_VERSION_INT		1680134400
 
 #endif
diff --git a/liveMedia/RTPInterface.cpp b/liveMedia/RTPInterface.cpp
@@ -382,7 +382,7 @@ Boolean RTPInterface::sendDataOverTCP(int socketNum, TLSState* tlsState,
 				      Boolean forceSendToSucceed) {
   int sendResult = (tlsState != NULL && tlsState->isNeeded)
     ? tlsState->write((char const*)data, dataSize)
-    : send(socketNum, (char const*)data, dataSize, 0/*flags*/);
+    : send(socketNum, (char const*)data, dataSize, MSG_NOSIGNAL/*flags*/);
   if (sendResult < (int)dataSize) {
     // The TCP send() failed - at least partially.
 
@@ -398,7 +398,7 @@ Boolean RTPInterface::sendDataOverTCP(int socketNum, TLSState* tlsState,
       makeSocketBlocking(socketNum, RTPINTERFACE_BLOCKING_WRITE_TIMEOUT_MS);
       sendResult = (tlsState != NULL && tlsState->isNeeded)
 	? tlsState->write((char const*)(&data[numBytesSentSoFar]), numBytesRemainingToSend)
-	: send(socketNum, (char const*)(&data[numBytesSentSoFar]), numBytesRemainingToSend, 0/*flags*/);
+	: send(socketNum, (char const*)(&data[numBytesSentSoFar]), numBytesRemainingToSend, MSG_NOSIGNAL/*flags*/);
       makeSocketNonBlocking(socketNum);
       if ((unsigned)sendResult != numBytesRemainingToSend) {
 	// The blocking "send()" failed, or timed out.  In either case, we assume that the

diff --git a/liveMedia/RTSPClient.cpp b/liveMedia/RTSPClient.cpp
@@ -2029,7 +2029,7 @@ int RTSPClient::write(const char* data, unsigned count) {
       if (fOutputTLS->isNeeded) {
 	return fOutputTLS->write(data, count);
       } else {
-	return send(fOutputSocketNum, data, count, 0);
+	return send(fOutputSocketNum, data, count, MSG_NOSIGNAL);
       }
 }
 

diff --git a/liveMedia/RTSPServer.cpp b/liveMedia/RTSPServer.cpp
@@ -985,7 +985,7 @@ void RTSPServer::RTSPClientConnection::handleRequestBytes(int newBytesRead) {
     if (fOutputTLS->isNeeded) {
         fOutputTLS->write((char const*)fResponseBuffer, numBytesToWrite);
     } else {
-        send(fClientOutputSocket, (char const*)fResponseBuffer, numBytesToWrite, 0);
+        send(fClientOutputSocket, (char const*)fResponseBuffer, numBytesToWrite, MSG_NOSIGNAL);
    }
 
     if (playAfterSetup) {

diff --git a/liveMedia/include/liveMedia_version.hh b/liveMedia/include/liveMedia_version.hh
@@ -19,7 +19,7 @@ along with this library; if not, write to the Free Software Foundation, Inc.,
 #ifndef _LIVEMEDIA_VERSION_HH
 #define _LIVEMEDIA_VERSION_HH
 
-#define LIVEMEDIA_LIBRARY_VERSION_STRING	"2023.01.19"
-#define LIVEMEDIA_LIBRARY_VERSION_INT		1674086400
+#define LIVEMEDIA_LIBRARY_VERSION_STRING	"2023.03.30"
+#define LIVEMEDIA_LIBRARY_VERSION_INT		1680134400
 
 #endif