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 not initializing data structures early enough.

Browse Source 
We were initialzing some sentinels and iterators when a connection was established.  But these variables are accessed when you just query the state of the connection, which might happen before then.
This commit is contained in:
Fletcher Dunn
2019-02-13 10:16:14 -08:00
parent 2d1597a21c
commit 49b46b85dc
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_snp.cpp
+27 -23
View File
@@ -198,34 +198,38 @@ void SSNPSenderState::RemoveAckedReliableMessageFromUnackedList()
}
}
//-----------------------------------------------------------------------------
SSNPSenderState::SSNPSenderState()
{
// Setup the table of inflight packets with a sentinel.
m_mapInFlightPacketsByPktNum.clear();
SNPInFlightPacket_t &sentinel = m_mapInFlightPacketsByPktNum[INT64_MIN];
sentinel.m_bNack = false;
sentinel.m_usecWhenSent = 0;
m_itNextInFlightPacketToTimeout = m_mapInFlightPacketsByPktNum.end();
}
//-----------------------------------------------------------------------------
SSNPReceiverState::SSNPReceiverState()
{
// Init packet gaps with a sentinel
m_mapPacketGaps.clear();
SSNPPacketGap &sentinel = m_mapPacketGaps[INT64_MAX];
sentinel.m_nEnd = INT64_MAX; // Fixed value
sentinel.m_usecWhenOKToNack = INT64_MAX; // Fixed value, for when there is nothing left to nack
sentinel.m_usecWhenAckPrior = INT64_MAX; // Time when we need to flush a report on all lower-numbered packets
// Point at the sentinel
m_itPendingAck = m_mapPacketGaps.end();
--m_itPendingAck;
m_itPendingNack = m_itPendingAck;
}
//-----------------------------------------------------------------------------
void CSteamNetworkConnectionBase::SNP_InitializeConnection( SteamNetworkingMicroseconds usecNow )
{
m_senderState.TokenBucket_Init( usecNow );
// Setup the table of inflight packets with a sentinel.
{
m_senderState.m_mapInFlightPacketsByPktNum.clear();
SNPInFlightPacket_t &sentinel = m_senderState.m_mapInFlightPacketsByPktNum[INT64_MIN];
sentinel.m_bNack = false;
sentinel.m_usecWhenSent = 0;
m_senderState.m_itNextInFlightPacketToTimeout = m_senderState.m_mapInFlightPacketsByPktNum.end();
}
// Init packet gaps with a sentinel
{
m_receiverState.m_mapPacketGaps.clear();
SSNPPacketGap &sentinel = m_receiverState.m_mapPacketGaps[INT64_MAX];
sentinel.m_nEnd = INT64_MAX; // Fixed value
sentinel.m_usecWhenOKToNack = INT64_MAX; // Fixed value, for when there is nothing left to nack
sentinel.m_usecWhenAckPrior = INT64_MAX; // Time when we need to flush a report on all lower-numbered packets
// Point at the sentinel
m_receiverState.m_itPendingAck = m_receiverState.m_mapPacketGaps.end();
--m_receiverState.m_itPendingAck;
m_receiverState.m_itPendingNack = m_receiverState.m_itPendingAck;
}
SteamNetworkingMicroseconds usecPing = GetUsecPingWithFallback( this );
/*
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_snp.h
+3
View File
@@ -170,6 +170,7 @@ struct SSNPSendMessageList
struct SSNPSenderState
{
SSNPSenderState();
~SSNPSenderState() {
Reset();
}
@@ -350,6 +351,8 @@ struct SSNPPacketGap
struct SSNPReceiverState
{
SSNPReceiverState();
/// Unreliable message segments that we have received. When an unreliable message
/// needs to be fragmented, we store the pieces here. NOTE: it might be more efficient
/// to use a simpler container, with worse O(), since this should ordinarily be