GitHub/GameNetworkingSockets
1
0
Fork 0
mirror of https://github.com/ValveSoftware/GameNetworkingSockets.git synced 2026-05-29 16:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug if low level datagram send fails.

Browse Source 
This could leak reliable messages and fail to honor fundamental protocol
guarantees about reliable message delivery(!).

This can happen but is incredibly rare for ordinary UDP, if, e.g we have
filled the send buffer.  it is much more likely with an P2P (ICE) connection.

P4:6868520
This commit is contained in:
Fletcher Dunn
2021-11-01 15:46:03 -07:00
parent e4601df658
commit dfdc47378f
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_connections.h
+1
View File
@@ -862,6 +862,7 @@ private:
uint8 *SNP_SerializeAckBlocks( const SNPPacketSerializeHelper &helper, uint8 *pOut, const uint8 *pOutEnd );
uint8 *SNP_SerializeStopWaitingFrame( SNPPacketSerializeHelper &helper, uint8 *pOut );
void SNP_QueueReliableSegmentsForRetry( SNPInFlightPacket_t &pkt, int64 nPktNumForDebug, const char *pszDebug );
void SetState( ESteamNetworkingConnectionState eNewState, SteamNetworkingMicroseconds usecNow );
ESteamNetworkingConnectionState m_eConnectionState;
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_snp.cpp
+12 -2
View File
@@ -1408,6 +1408,11 @@ void CSteamNetworkConnectionBase::SNP_SenderProcessPacketNack( int64 nPktNum, SN
m_senderState.MaybeCheckReliable();
// Schedule any reliable segments for retry
SNP_QueueReliableSegmentsForRetry( pkt, nPktNum, pszDebug );
}
void CSteamNetworkConnectionBase::SNP_QueueReliableSegmentsForRetry( SNPInFlightPacket_t &pkt, int64 nPktNumForDebug, const char *pszDebug )
{
for ( uint16 hSeg: pkt.m_vecReliableSegments )
{
SNPSendReliableSegment_t &relSeg = m_senderState.m_listSentReliableSegments[ hSeg ];
@@ -1444,7 +1449,7 @@ void CSteamNetworkConnectionBase::SNP_SenderProcessPacketNack( int64 nPktNum, SN
SpewMsgGroup( m_connectionConfig.m_LogLevel_PacketDecode.Get(), "[%s] pkt %lld %s, queueing retry of reliable range [%lld,%lld)\n",
GetDescription(),
nPktNum,
nPktNumForDebug,
pszDebug,
relSeg.begin(), relSeg.begin() + cbSeg );
@@ -1830,7 +1835,12 @@ bool CSteamNetworkConnectionBase::SNP_SendPacket( CConnectionTransport *pTranspo
}
}
if ( nBytesSent <= 0 )
return false; // FIXME - We have transfered ownership of some messages to the segments in helper.m_insertInflightPkt. We are gonna leak these?
{
// We have potentially transfered ownership of some reliable messages
// to the segments in helper.m_insertInflightPkt. We must not leak those!
SNP_QueueReliableSegmentsForRetry( helper.m_insertInflightPkt.second, 0, "Send fail" );
return false;
}
// We sent a packet. Track it
auto pairInsertResult = m_senderState.m_mapInFlightPacketsByPktNum.insert( helper.m_insertInflightPkt );