[core] Fixed accidental blocking on sendmsg call

Mikolaj Malecki · cl-ment · commit 4d0e98408864 · 2025-03-14T09:11:38.000+01:00
diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
@@ -552,6 +552,10 @@ void srt::CChannel::setUDPSockOpt()
     // Set receiving time-out value
     if (-1 == ::setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&tv, sizeof(timeval)))
         throw CUDTException(MJ_SETUP, MN_NORES, NET_ERROR);
+    // Set sending time-out, too; O_NONBLOCK sets it in both directions,
+    // so both should be also set here for consistency.
+    if (-1 == ::setsockopt(m_iSocket, SOL_SOCKET, SO_SNDTIMEO, (char*)&tv, sizeof(timeval)))
+        throw CUDTException(MJ_SETUP, MN_NORES, NET_ERROR);
 #endif
 
 #ifdef SRT_ENABLE_PKTINFO
diff --git a/srtcore/core.cpp b/srtcore/core.cpp
@@ -8358,6 +8358,7 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)
         {
             ctrlpkt.pack(UMSG_ACK, &m_iAckSeqNo, data, ACKD_FIELD_SIZE * ACKD_TOTAL_SIZE_SMALL);
         }
+        bufflock.unlock();
 
         ctrlpkt.set_id(m_PeerID);
         setPacketTS(ctrlpkt, steady_clock::now());

Original file line number	Diff line number	Diff line change
`@@ -8358,6 +8358,7 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)`
`8358`	`8358`	`{`
`8359`	`8359`	`ctrlpkt.pack(UMSG_ACK, &m_iAckSeqNo, data, ACKD_FIELD_SIZE * ACKD_TOTAL_SIZE_SMALL);`
`8360`	`8360`	`}`
	`8361`	`+ bufflock.unlock();`
`8361`	`8362`
`8362`	`8363`	`ctrlpkt.set_id(m_PeerID);`
`8363`	`8364`	`setPacketTS(ctrlpkt, steady_clock::now());`