mediasoup 3.13.12 → 3.13.13

package/node/lib/ortc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ortc.d.ts","sourceRoot":"","sources":["../src/ortc.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ortc.d.ts","sourceRoot":"","sources":["../src/ortc.ts"],"names":[],"mappings":"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"}

package/node/lib/ortc.js

@@ -949,7 +949,7 @@ function matchCodecs(aCodec, bCodec, { strict = false, modify = false } = {}) {
                     let selectedProfileLevelId;
                     try {
                         selectedProfileLevelId =
-                            h264.generateProfileLevelIdForAnswer(aCodec.parameters, bCodec.parameters);
+                            h264.generateProfileLevelIdStringForAnswer(aCodec.parameters, bCodec.parameters);
                     }
                     catch (error) {
                         return false;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediasoup",
-  "version": "3.13.12",
+  "version": "3.13.13",
   "description": "Cutting Edge WebRTC Video Conferencing",
   "contributors": [
     "Iñaki Baz Castillo <ibc@aliax.net> (https://inakibaz.me)",
@@ -99,7 +99,7 @@
   "dependencies": {
     "debug": "^4.3.4",
     "flatbuffers": "^23.5.26",
-    "h264-profile-level-id": "^1.1.0",
+    "h264-profile-level-id": "^2.0.0",
     "node-fetch": "^3.3.2",
     "supports-color": "^9.4.0",
     "tar": "^6.2.0"
@@ -109,8 +109,8 @@
     "@types/debug": "^4.1.12",
     "@types/jest": "^29.5.11",
     "@types/node": "^20.10.5",
-    "@typescript-eslint/eslint-plugin": "^6.14.0",
-    "@typescript-eslint/parser": "^6.14.0",
+    "@typescript-eslint/eslint-plugin": "^6.16.0",
+    "@typescript-eslint/parser": "^6.16.0",
     "eslint": "^8.56.0",
     "eslint-plugin-jest": "^27.6.0",
     "jest": "^29.7.0",

package/worker/include/DepLibUring.hpp

@@ -80,6 +80,10 @@ public:
 		{
 			return this->active;
 		}
+		bool IsZeroCopyEnabled() const
+		{
+			return this->zeroCopyEnabled;
+		}
 		io_uring* GetRing()
 		{
 			return std::addressof(this->ring);
@@ -103,18 +107,22 @@ public:
 	private:
 		// io_uring instance.
 		io_uring ring;
-		// Event file descriptor to watch for completions.
+		// Event file descriptor to watch for io_uring completions.
 		int efd;
 		// libuv handle used to poll io_uring completions.
 		uv_poll_t* uvHandle{ nullptr };
 		// Whether we are currently sending RTP over io_uring.
 		bool active{ false };
+		// Whether Zero Copy feature is enabled.
+		bool zeroCopyEnabled{ true };
 		// Pre-allocated UserData's.
 		UserData userDatas[QueueDepth]{};
 		// Indexes of available UserData entries.
 		std::queue<size_t> availableUserDataEntries;
 		// Pre-allocated SendBuffer's.
 		SendBuffer sendBuffers[QueueDepth];
+		// iovec structs to be registered for Zero Copy.
+		struct iovec iovecs[QueueDepth];
 		// Submission queue entry process count.
 		uint64_t sqeProcessCount{ 0u };
 		// Submission queue entry miss count.

package/worker/include/RTC/SenderBandwidthEstimator.hpp

@@ -89,7 +89,7 @@ namespace RTC
 	public:
 		void TransportConnected();
 		void TransportDisconnected();
-		void RtpPacketSent(SentInfo& sentInfo);
+		void RtpPacketSent(const SentInfo& sentInfo);
 		void ReceiveRtcpTransportFeedback(const RTC::RTCP::FeedbackRtpTransportPacket* feedback);
 		void EstimateAvailableBitrate(CummulativeResult& cummulativeResult);
 		void UpdateRtt(float rtt);

package/worker/include/RTC/TransportCongestionControlClient.hpp

@@ -69,7 +69,7 @@ namespace RTC
 		void TransportDisconnected();
 		void InsertPacket(webrtc::RtpPacketSendInfo& packetInfo);
 		webrtc::PacedPacketInfo GetPacingInfo();
-		void PacketSent(webrtc::RtpPacketSendInfo& packetInfo, int64_t nowMs);
+		void PacketSent(const webrtc::RtpPacketSendInfo& packetInfo, int64_t nowMs);
 		void ReceiveEstimatedBitrate(uint32_t bitrate);
 		void ReceiveRtcpReceiverReport(RTC::RTCP::ReceiverReportPacket* packet, float rtt, int64_t nowMs);
 		void ReceiveRtcpTransportFeedback(const RTC::RTCP::FeedbackRtpTransportPacket* feedback);

package/worker/include/Utils.hpp

@@ -23,6 +23,8 @@ namespace Utils
 
 		static void GetAddressInfo(const struct sockaddr* addr, int& family, std::string& ip, uint16_t& port);
 
+		static size_t GetAddressLen(const struct sockaddr* addr);
+
 		static bool CompareAddresses(const struct sockaddr* addr1, const struct sockaddr* addr2)
 		{
 			// Compare family.

package/worker/meson.build

@@ -44,6 +44,18 @@ if get_option('ms_rtc_logger_rtp')
   ]
 endif
 
+cpp = meson.get_compiler('cpp')
+
+# This is a workaround to define FLATBUFFERS_LOCALE_INDEPENDENT=0 outside
+# flatbuffers project, which is needed in case the current arch doesn't support
+# strtoll_l or strtoull_l (such as musl in Alpine Linux). Problem is that
+# flatbuffers build system not only defines it for its own usage but also relies
+# on it in its include/flatbuffers/util.h file, and if such a file is included
+# by mediasoup source files (and it is included) build fails with "error:
+# 'strtoull_l' was not declared in this scope".
+# See issue: https://github.com/versatica/mediasoup/issues/1223
+add_project_arguments('-DFLATBUFFERS_LOCALE_INDEPENDENT=@0@'.format(cpp.has_function('strtoull_l')), language: 'cpp')
+
 common_sources = [
   'src/lib.cpp',
   'src/DepLibSRTP.cpp',
@@ -163,14 +175,13 @@ common_sources = [
   'src/RTC/RTCP/XrReceiverReferenceTime.cpp',
 ]
 
-cpp = meson.get_compiler('cpp')
-
 openssl_proj = subproject(
   'openssl',
   default_options: [
     'warning_level=0',
   ],
 )
+
 libuv_proj = subproject(
   'libuv',
   default_options: [
@@ -179,6 +190,7 @@ libuv_proj = subproject(
     'build_benchmarks=false',
   ],
 )
+
 libsrtp2_proj = subproject(
   'libsrtp2',
   default_options: [
@@ -188,6 +200,7 @@ libsrtp2_proj = subproject(
     'tests=disabled',
   ],
 )
+
 usrsctp_proj = subproject(
   'usrsctp',
   default_options: [
@@ -195,6 +208,7 @@ usrsctp_proj = subproject(
     'sctp_build_programs=false',
   ],
 )
+
 abseil_cpp_proj = subproject(
   'abseil-cpp',
   default_options: [
@@ -202,20 +216,24 @@ abseil_cpp_proj = subproject(
     'cpp_std=c++17',
   ],
 )
+
 catch2_proj = subproject(
   'catch2',
   default_options: [
     'warning_level=0',
   ],
 )
+
 flatbuffers_proj = subproject(
   'flatbuffers',
   default_options: [
     'warning_level=0',
   ],
 )
+
 # flatbuffers schemas subdirectory.
 subdir('fbs')
+
 # Add current build directory so libwebrtc has access to FBS folder.
 libwebrtc_include_directories = include_directories('include', 'fbs')
 subdir('deps/libwebrtc')
@@ -305,48 +323,48 @@ executable(
 )
 
 test_sources = [
-    'test/src/tests.cpp',
-    'test/src/RTC/TestKeyFrameRequestManager.cpp',
-    'test/src/RTC/TestNackGenerator.cpp',
-    'test/src/RTC/TestRateCalculator.cpp',
-    'test/src/RTC/TestRtpPacket.cpp',
-    'test/src/RTC/TestRtpPacketH264Svc.cpp',
-    'test/src/RTC/TestRtpRetransmissionBuffer.cpp',
-    'test/src/RTC/TestRtpStreamSend.cpp',
-    'test/src/RTC/TestRtpStreamRecv.cpp',
-    'test/src/RTC/TestSeqManager.cpp',
-    'test/src/RTC/TestTrendCalculator.cpp',
-    'test/src/RTC/TestRtpEncodingParameters.cpp',
-    'test/src/RTC/Codecs/TestVP8.cpp',
-    'test/src/RTC/Codecs/TestVP9.cpp',
-    'test/src/RTC/Codecs/TestH264.cpp',
-    'test/src/RTC/Codecs/TestH264_SVC.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsAfb.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsFir.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsLei.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsPli.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsRemb.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsSli.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsTst.cpp',
-    'test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpNack.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp',
-    'test/src/RTC/RTCP/TestFeedbackRtpTransport.cpp',
-    'test/src/RTC/RTCP/TestBye.cpp',
-    'test/src/RTC/RTCP/TestReceiverReport.cpp',
-    'test/src/RTC/RTCP/TestSdes.cpp',
-    'test/src/RTC/RTCP/TestSenderReport.cpp',
-    'test/src/RTC/RTCP/TestPacket.cpp',
-    'test/src/RTC/RTCP/TestXr.cpp',
-    'test/src/Utils/TestBits.cpp',
-    'test/src/Utils/TestByte.cpp',
-    'test/src/Utils/TestIP.cpp',
-    'test/src/Utils/TestString.cpp',
-    'test/src/Utils/TestTime.cpp',
+  'test/src/tests.cpp',
+  'test/src/RTC/TestKeyFrameRequestManager.cpp',
+  'test/src/RTC/TestNackGenerator.cpp',
+  'test/src/RTC/TestRateCalculator.cpp',
+  'test/src/RTC/TestRtpPacket.cpp',
+  'test/src/RTC/TestRtpPacketH264Svc.cpp',
+  'test/src/RTC/TestRtpRetransmissionBuffer.cpp',
+  'test/src/RTC/TestRtpStreamSend.cpp',
+  'test/src/RTC/TestRtpStreamRecv.cpp',
+  'test/src/RTC/TestSeqManager.cpp',
+  'test/src/RTC/TestTrendCalculator.cpp',
+  'test/src/RTC/TestRtpEncodingParameters.cpp',
+  'test/src/RTC/Codecs/TestVP8.cpp',
+  'test/src/RTC/Codecs/TestVP9.cpp',
+  'test/src/RTC/Codecs/TestH264.cpp',
+  'test/src/RTC/Codecs/TestH264_SVC.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsAfb.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsFir.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsLei.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsPli.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsRemb.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsRpsi.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsSli.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsTst.cpp',
+  'test/src/RTC/RTCP/TestFeedbackPsVbcm.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpEcn.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpNack.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpSrReq.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpTllei.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpTmmb.cpp',
+  'test/src/RTC/RTCP/TestFeedbackRtpTransport.cpp',
+  'test/src/RTC/RTCP/TestBye.cpp',
+  'test/src/RTC/RTCP/TestReceiverReport.cpp',
+  'test/src/RTC/RTCP/TestSdes.cpp',
+  'test/src/RTC/RTCP/TestSenderReport.cpp',
+  'test/src/RTC/RTCP/TestPacket.cpp',
+  'test/src/RTC/RTCP/TestXr.cpp',
+  'test/src/Utils/TestBits.cpp',
+  'test/src/Utils/TestByte.cpp',
+  'test/src/Utils/TestIP.cpp',
+  'test/src/Utils/TestString.cpp',
+  'test/src/Utils/TestTime.cpp',
 ]
 
 mediasoup_worker_test = executable(

package/worker/scripts/cppcheck.sh

@@ -29,7 +29,7 @@ CPPCHECKS="warning,style,performance,portability,unusedFunction"
 XML_FILE="/tmp/mediasoup-worker-cppcheck.xml"
 HTML_REPORT_DIR="/tmp/mediasoup-worker-cppcheck-report"
 
-echo ">>> [INFO] running cppcheck ..."
+echo ">>> [INFO] running cppcheck..."
 cppcheck --std=c++11 --enable=${CPPCHECKS} -v --quiet --report-progress --inline-suppr --error-exitcode=69 -I include src --xml-version=2 2> $XML_FILE
 
 # If exit code is 1 it means that some cppcheck option is wrong, so abort.
@@ -40,12 +40,12 @@ fi
 
 echo ">>> [INFO] cppcheck XML report file generated in ${XML_FILE}"
 
-echo ">>> [INFO] running cppcheck-htmlreport ..."
+echo ">>> [INFO] running cppcheck-htmlreport..."
 cppcheck-htmlreport --title="mediasoup-worker" --file=${XML_FILE} --report-dir=${HTML_REPORT_DIR} --source-dir=. > /dev/null
 
 echo ">>> [INFO] cppcheck HTML report generated in ${HTML_REPORT_DIR}"
 
 if type "open" &> /dev/null; then
-	echo ">>> [INFO] opening HTML report ..."
+	echo ">>> [INFO] opening HTML report..."
 	open ${HTML_REPORT_DIR}/index.html
 fi

package/worker/scripts/flint++.sh

@@ -13,9 +13,9 @@ if ! type "flint++" &> /dev/null; then
 	exit 1
 fi
 
-echo ">>> [INFO] running flint++ in src/ folder ..."
+echo ">>> [INFO] running flint++ in src/ folder..."
 flint++ --recursive --verbose src/
 
 echo
-echo ">>> [INFO] running flint++ in include/ folder ..."
+echo ">>> [INFO] running flint++ in include/ folder..."
 flint++ --recursive --verbose include/

package/worker/scripts/get-dep.sh

@@ -17,24 +17,24 @@ function get_dep()
 	GIT_TAG="$2"
 	DEST="$3"
 
-	echo ">>> [INFO] getting dep '${DEP}' ..."
+	echo ">>> [INFO] getting dep '${DEP}'..."
 
 	if [ -d "${DEST}" ] ; then
-		echo ">>> [INFO] deleting ${DEST} ..."
+		echo ">>> [INFO] deleting ${DEST}..."
 		git rm -rf --ignore-unmatch ${DEST} > /dev/null
 		rm -rf ${DEST}
 	fi
 
-	echo ">>> [INFO] cloning ${GIT_REPO} ..."
+	echo ">>> [INFO] cloning ${GIT_REPO}..."
 	git clone ${GIT_REPO} ${DEST}
 
 	cd ${DEST}
 
-	echo ">>> [INFO] setting '${GIT_TAG}' git tag ..."
+	echo ">>> [INFO] setting '${GIT_TAG}' git tag..."
 	git checkout --quiet ${GIT_TAG}
 	set -e
 
-	echo ">>> [INFO] adding dep source code to the repository ..."
+	echo ">>> [INFO] adding dep source code to the repository..."
 	rm -rf .git
 	git add .
 

package/worker/src/DepLibUring.cpp

@@ -4,6 +4,7 @@
 #include "DepLibUring.hpp"
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
+#include "Utils.hpp"
 #include <sys/eventfd.h>
 #include <sys/utsname.h>
 
@@ -30,9 +31,13 @@ inline static void onFdEvent(uv_poll_t* handle, int status, int events)
 	// the counter in order to avoid libuv calling this callback indefinitely.
 	eventfd_t v;
 	int err = eventfd_read(liburing->GetEventFd(), std::addressof(v));
+
 	if (err < 0)
 	{
-		MS_ABORT("eventfd_read() failed: %s", std::strerror(-err));
+		// Get positive errno.
+		int error = -err;
+
+		MS_ABORT("eventfd_read() failed: %s", std::strerror(error));
 	};
 
 	for (unsigned int i{ 0 }; i < count; ++i)
@@ -40,27 +45,69 @@ inline static void onFdEvent(uv_poll_t* handle, int status, int events)
 		struct io_uring_cqe* cqe = cqes[i];
 		auto* userData           = static_cast<DepLibUring::UserData*>(io_uring_cqe_get_data(cqe));
 
-		if (cqe->res < 0)
+		if (liburing->IsZeroCopyEnabled())
 		{
-			MS_ERROR("sending failed: %s", std::strerror(-cqe->res));
+			// CQE notification for a zero-copy submission.
+			if (cqe->flags & IORING_CQE_F_NOTIF)
+			{
+				// The send buffer is now in the network card, run the send callback.
+				if (userData->cb)
+				{
+					(*userData->cb)(true);
+					delete userData->cb;
+					userData->cb = nullptr;
+				}
+
+				liburing->ReleaseUserDataEntry(userData->idx);
+				io_uring_cqe_seen(liburing->GetRing(), cqe);
+
+				continue;
+			}
 
+			// CQE for a zero-copy submission, a CQE notification will follow.
+			if (cqe->flags & IORING_CQE_F_MORE)
+			{
+				if (cqe->res < 0)
+				{
+					if (userData->cb)
+					{
+						(*userData->cb)(false);
+						delete userData->cb;
+						userData->cb = nullptr;
+					}
+				}
+
+				// NOTE: Do not release the user data as it will be done upon reception
+				// of CQE notification.
+				io_uring_cqe_seen(liburing->GetRing(), cqe);
+
+				continue;
+			}
+		}
+
+		// Successfull SQE.
+		if (cqe->res >= 0)
+		{
 			if (userData->cb)
 			{
-				(*userData->cb)(false);
+				(*userData->cb)(true);
 				delete userData->cb;
+				userData->cb = nullptr;
 			}
 		}
+		// Failed SQE.
 		else
 		{
 			if (userData->cb)
 			{
-				(*userData->cb)(true);
+				(*userData->cb)(false);
 				delete userData->cb;
+				userData->cb = nullptr;
 			}
 		}
 
-		io_uring_cqe_seen(liburing->GetRing(), cqe);
 		liburing->ReleaseUserDataEntry(userData->idx);
+		io_uring_cqe_seen(liburing->GetRing(), cqe);
 	}
 }
 
@@ -234,7 +281,10 @@ DepLibUring::LibUring::LibUring()
 
 	if (err < 0)
 	{
-		MS_THROW_ERROR("io_uring_queue_init() failed: %s", std::strerror(-err));
+		// Get positive errno.
+		int error = -err;
+
+		MS_THROW_ERROR("io_uring_queue_init() failed: %s", std::strerror(error));
 	}
 
 	// Create an eventfd instance.
@@ -249,7 +299,10 @@ DepLibUring::LibUring::LibUring()
 
 	if (err < 0)
 	{
-		MS_THROW_ERROR("io_uring_register_eventfd() failed: %s", std::strerror(-err));
+		// Get positive errno.
+		int error = -err;
+
+		MS_THROW_ERROR("io_uring_register_eventfd() failed: %s", std::strerror(error));
 	}
 
 	// Initialize available UserData entries.
@@ -258,6 +311,35 @@ DepLibUring::LibUring::LibUring()
 		this->userDatas[i].store = this->sendBuffers[i];
 		this->availableUserDataEntries.push(i);
 	}
+
+	// Initialize iovecs.
+	for (size_t i{ 0 }; i < DepLibUring::QueueDepth; ++i)
+	{
+		this->iovecs[i].iov_base = this->sendBuffers[i];
+		this->iovecs[i].iov_len  = DepLibUring::SendBufferSize;
+	}
+
+	err = io_uring_register_buffers(std::addressof(this->ring), this->iovecs, DepLibUring::QueueDepth);
+
+	if (err < 0)
+	{
+		// Get positive errno.
+		int error = -err;
+
+		if (error == ENOMEM)
+		{
+			this->zeroCopyEnabled = false;
+
+			MS_WARN_TAG(
+			  info,
+			  "io_uring_register_buffers() failed due to low memlock limit (ulimit -l), disabling zero copy: %s",
+			  std::strerror(error));
+		}
+		else
+		{
+			MS_THROW_ERROR("io_uring_register_buffers() failed: %s", std::strerror(error));
+		}
+	}
 }
 
 DepLibUring::LibUring::~LibUring()
@@ -269,7 +351,10 @@ DepLibUring::LibUring::~LibUring()
 
 	if (err != 0)
 	{
-		MS_ABORT("close() failed: %s", std::strerror(-err));
+		// Get positive errno.
+		int error = -err;
+
+		MS_ABORT("close() failed: %s", std::strerror(error));
 	}
 
 	// Close the ring.
@@ -372,8 +457,6 @@ bool DepLibUring::LibUring::PrepareSend(
 		return false;
 	}
 
-	userData->cb = cb;
-
 	// The send data buffer belongs to us, no need to memcpy.
 	if (this->IsDataInSendBuffers(data))
 	{
@@ -384,21 +467,30 @@ bool DepLibUring::LibUring::PrepareSend(
 		std::memcpy(userData->store, data, len);
 	}
 
+	userData->cb = cb;
+
 	io_uring_sqe_set_data(sqe, userData);
 
-	socklen_t addrlen = 0;
+	socklen_t addrlen = Utils::IP::GetAddressLen(addr);
 
-	if (addr->sa_family == AF_INET)
+	if (this->zeroCopyEnabled)
 	{
-		addrlen = sizeof(struct sockaddr_in);
+		auto iovec    = this->iovecs[userData->idx];
+		iovec.iov_len = len;
+
+		io_uring_prep_send_zc(sqe, sockfd, iovec.iov_base, iovec.iov_len, 0, 0);
+		io_uring_prep_send_set_addr(sqe, addr, addrlen);
+
+		// Tell io_uring that we are providing the already registered send buffer
+		// for zero copy.
+		sqe->ioprio |= IORING_RECVSEND_FIXED_BUF;
+		sqe->buf_index = userData->idx;
 	}
-	else if (addr->sa_family == AF_INET6)
+	else
 	{
-		addrlen = sizeof(struct sockaddr_in6);
+		io_uring_prep_sendto(sqe, sockfd, userData->store, len, 0, addr, addrlen);
 	}
 
-	io_uring_prep_sendto(sqe, sockfd, userData->store, len, 0, addr, addrlen);
-
 	this->sqeProcessCount++;
 
 	return true;
@@ -482,7 +574,10 @@ void DepLibUring::LibUring::Submit()
 	}
 	else
 	{
-		MS_ERROR("io_uring_submit() failed: %s", std::strerror(-err));
+		// Get positive errno.
+		int error = -err;
+
+		MS_ERROR("io_uring_submit() failed: %s", std::strerror(error));
 	}
 }
 

package/worker/src/RTC/SctpAssociation.cpp

@@ -503,7 +503,7 @@ namespace RTC
 		auto streamId = dataProducer->GetSctpStreamParameters().streamId;
 
 		// Send SCTP_RESET_STREAMS to the remote.
-		// https://tools.ietf.org/html/draft-ietf-rtcweb-data-channel-13#section-6.7
+		// https://tools.ietf.org/html/rfc8831#section-6.7
 		if (this->isDataChannel)
 		{
 			ResetSctpStream(streamId, StreamDirection::OUTGOING);

package/worker/src/RTC/SenderBandwidthEstimator.cpp

@@ -47,7 +47,7 @@ namespace RTC
 		this->cummulativeResult.Reset();
 	}
 
-	void SenderBandwidthEstimator::RtpPacketSent(SentInfo& sentInfo)
+	void SenderBandwidthEstimator::RtpPacketSent(const SentInfo& sentInfo)
 	{
 		MS_TRACE();
 

package/worker/src/RTC/Transport.cpp

@@ -2493,7 +2493,7 @@ namespace RTC
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
 			auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo, senderBweWeakPtr, &sentInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo, senderBweWeakPtr, sentInfo](bool sent)
 			  {
 				  if (sent)
 				  {
@@ -2517,7 +2517,7 @@ namespace RTC
 			SendRtpPacket(consumer, packet, cb);
 #else
 			const auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo](bool sent)
 			  {
 				  if (sent)
 				  {
@@ -2582,7 +2582,7 @@ namespace RTC
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
 			auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo, senderBweWeakPtr, &sentInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo, senderBweWeakPtr, sentInfo](bool sent)
 			  {
 				  if (sent)
 				  {
@@ -2606,7 +2606,7 @@ namespace RTC
 			SendRtpPacket(consumer, packet, cb);
 #else
 			const auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo](bool sent)
 			  {
 				  if (sent)
 				  {
@@ -2982,7 +2982,7 @@ namespace RTC
 			sentInfo.sendingAtMs = DepLibUV::GetTimeMs();
 
 			auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo, senderBweWeakPtr, &sentInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo, senderBweWeakPtr, sentInfo](bool sent)
 			  {
 				  if (sent)
 				  {
@@ -3006,7 +3006,7 @@ namespace RTC
 			SendRtpPacket(nullptr, packet, cb);
 #else
 			const auto* cb = new onSendCallback(
-			  [tccClientWeakPtr, &packetInfo](bool sent)
+			  [tccClientWeakPtr, packetInfo](bool sent)
 			  {
 				  if (sent)
 				  {

package/worker/src/RTC/TransportCongestionControlClient.cpp

@@ -152,7 +152,8 @@ namespace RTC
 		return this->rtpTransportControllerSend->packet_sender()->GetPacingInfo();
 	}
 
-	void TransportCongestionControlClient::PacketSent(webrtc::RtpPacketSendInfo& packetInfo, int64_t nowMs)
+	void TransportCongestionControlClient::PacketSent(
+	  const webrtc::RtpPacketSendInfo& packetInfo, int64_t nowMs)
 	{
 		MS_TRACE();
 

package/worker/src/Utils/IP.cpp

@@ -91,6 +91,29 @@ namespace Utils
 		ip.assign(ipBuffer);
 	}
 
+	size_t IP::GetAddressLen(const struct sockaddr* addr)
+	{
+		MS_TRACE();
+
+		switch (addr->sa_family)
+		{
+			case AF_INET:
+			{
+				return sizeof(struct sockaddr_in);
+			}
+
+			case AF_INET6:
+			{
+				return sizeof(struct sockaddr_in6);
+			}
+
+			default:
+			{
+				MS_ABORT("unknown network family: %d", static_cast<int>(addr->sa_family));
+			}
+		}
+	}
+
 	void IP::NormalizeIp(std::string& ip)
 	{
 		MS_TRACE();

package/worker/tasks.py

@@ -140,59 +140,30 @@ def setup(ctx):
     """
     Run meson setup
     """
-    # We add --reconfigure first as a workaround for this issue:
-    # https://github.com/ninja-build/ninja/issues/1997
     if MEDIASOUP_BUILDTYPE == 'Release':
-        try:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype release -Db_ndebug=true -Db_pie=true -Db_staticpic=true --reconfigure {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
-        except:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype release -Db_ndebug=true -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
+        with ctx.cd(WORKER_DIR):
+            ctx.run(
+                f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype release -Db_ndebug=true -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
+                echo=True,
+                pty=PTY_SUPPORTED,
+                shell=SHELL
+            );
     elif MEDIASOUP_BUILDTYPE == 'Debug':
-        try:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype debug -Db_pie=true -Db_staticpic=true --reconfigure {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
-        except:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype debug -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
+        with ctx.cd(WORKER_DIR):
+            ctx.run(
+                f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype debug -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
+                echo=True,
+                pty=PTY_SUPPORTED,
+                shell=SHELL
+            );
     else:
-        try:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype {MEDIASOUP_BUILDTYPE} -Db_ndebug=if-release -Db_pie=true -Db_staticpic=true --reconfigure {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
-        except:
-            with ctx.cd(WORKER_DIR):
-                ctx.run(
-                    f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype {MEDIASOUP_BUILDTYPE} -Db_ndebug=if-release -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
-                    echo=True,
-                    pty=PTY_SUPPORTED,
-                    shell=SHELL
-                );
+        with ctx.cd(WORKER_DIR):
+            ctx.run(
+                f'"{MESON}" setup --prefix "{MEDIASOUP_INSTALL_DIR}" --bindir "" --libdir "" --buildtype {MEDIASOUP_BUILDTYPE} -Db_ndebug=if-release -Db_pie=true -Db_staticpic=true {MESON_ARGS} "{BUILD_DIR}"',
+                echo=True,
+                pty=PTY_SUPPORTED,
+                shell=SHELL
+            );
 
 
 @task
@@ -350,7 +321,7 @@ def xcode(ctx):
     """
     with ctx.cd(WORKER_DIR):
         ctx.run(
-            f'"{MESON}" setup --buildtype {MEDIASOUP_BUILDTYPE} --backend xcode "{MEDIASOUP_OUT_DIR}/xcode"',
+            f'"{MESON}" setup --buildtype {MEDIASOUP_BUILDTYPE.lower()} --backend xcode "{MEDIASOUP_OUT_DIR}/xcode"',
             echo=True,
             pty=PTY_SUPPORTED,
             shell=SHELL