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

ICE client refactor: delete m_vecHostCandidateSockets

Browse Source 
Just store the socket in the corresponding Interface
This commit is contained in:
Fletcher Dunn
2026-05-25 12:26:24 -07:00
parent 9273c5bcc9
commit bf19de7778
2 changed files with 71 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_ice_client.cpp
+50 -41
View File
@@ -1121,9 +1121,14 @@ CSteamNetworkingICESession::~CSteamNetworkingICESession()
delete pPair;
m_vecCandidatePairs.clear();
for ( IRawUDPSocket *pSock: m_vecHostCandidateSockets )
pSock->Close();
m_vecHostCandidateSockets.clear();
for ( Interface &intf: m_vecInterfaces )
{
if ( intf.m_pSocket != nullptr )
{
intf.m_pSocket->Close();
intf.m_pSocket = nullptr;
}
}
}
SteamNetworkingIPAddr CSteamNetworkingICESession::GetSelectedDestination()
@@ -1225,20 +1230,46 @@ void CSteamNetworkingICESession::GatherInterfaces()
{
SteamNetworkingGlobalLock::AssertHeldByCurrentThread( "CSteamNetworkingICESession::GatherInterfaces" );
m_vecInterfaces.clear();
CUtlVector<LocalAddress_t> vecAddrs;
if ( !GetLocalAddresses( &vecAddrs ) )
return;
// Save previous interface list so we can preserve sockets across re-enumeration.
std_vector<Interface> vecOldInterfaces;
std::swap( vecOldInterfaces, m_vecInterfaces );
uint32 uPriority = 65535;
m_bInterfaceListStale = false;
m_vecInterfaces.reserve( vecAddrs.Count() );
for ( int i = 0; i < vecAddrs.Count(); ++i )
{
m_vecInterfaces.push_back( Interface( vecAddrs[i].m_addr, uPriority, vecAddrs[i].m_nPrefixLen ) );
Interface newIntf( vecAddrs[i].m_addr, uPriority, vecAddrs[i].m_nPrefixLen );
// Transfer the socket from the old entry if this interface was already known.
for ( Interface &oldIntf : vecOldInterfaces )
{
if ( oldIntf.m_localaddr == newIntf.m_localaddr )
{
newIntf.m_pSocket = oldIntf.m_pSocket;
oldIntf.m_pSocket = nullptr; // ownership transferred
break;
}
}
m_vecInterfaces.push_back( newIntf );
--uPriority;
}
// Close sockets for interfaces that disappeared.
for ( Interface &oldIntf : vecOldInterfaces )
{
if ( oldIntf.m_pSocket != nullptr )
{
oldIntf.m_pSocket->Close();
oldIntf.m_pSocket = nullptr;
}
}
}
int CSteamNetworkingICESession::GetLocalCandidatePrefixLen( const SteamNetworkingIPAddr &addr ) const
@@ -1257,10 +1288,10 @@ int CSteamNetworkingICESession::GetLocalCandidatePrefixLen( const SteamNetworkin
IRawUDPSocket *CSteamNetworkingICESession::FindSocketForCandidate( const SteamNetworkingIPAddr& addr )
{
for ( IRawUDPSocket *pSock : m_vecHostCandidateSockets )
for ( Interface &intf : m_vecInterfaces )
{
if ( addr == pSock->m_boundAddr )
return pSock;
if ( intf.m_pSocket != nullptr && addr == intf.m_pSocket->m_boundAddr )
return intf.m_pSocket;
}
return nullptr;
}
@@ -1577,33 +1608,27 @@ void CSteamNetworkingICESession::UpdateHostCandidates()
std_vector<ICECandidate> vecPreviousCandidates;
std::swap( vecPreviousCandidates, m_vecCandidates );
for ( const Interface& intf: m_vecInterfaces )
for ( Interface& intf: m_vecInterfaces )
{
SteamNetworkingIPAddr hostCandidateAddr = intf.m_localaddr;
hostCandidateAddr.m_port = 0;
const uint32 nLocalPriority = intf.m_nPriority;
bool bSawPrevCandidate = false;
ICECandidate *pAddedCandidate = nullptr;
for( const ICECandidate& prevCandidate : vecPreviousCandidates )
{
if ( prevCandidate.m_base == hostCandidateAddr )
{
bSawPrevCandidate = true;
pAddedCandidate = push_back_get_ptr( m_vecCandidates, prevCandidate );
}
}
if ( !bSawPrevCandidate )
if ( intf.m_pSocket == nullptr )
{
SteamDatagramErrMsg errMsg;
SteamNetworkingIPAddr bindAddr = hostCandidateAddr;
IRawUDPSocket *pSock = OpenRawUDPSocket( CRecvPacketCallback( CSteamNetworkingICESession::StaticPacketReceived, this ), errMsg, &bindAddr, nullptr );
if ( pSock != nullptr )
{
if ( hostCandidateAddr.m_port == 0 )
hostCandidateAddr.m_port = pSock->m_boundAddr.m_port;
m_vecHostCandidateSockets.push_back( pSock );
pAddedCandidate = push_back_get_ptr( m_vecCandidates, ICECandidate( kICECandidateType_Host, hostCandidateAddr, hostCandidateAddr ) );
hostCandidateAddr.m_port = pSock->m_boundAddr.m_port;
intf.m_pSocket = pSock;
}
else
{
@@ -1611,12 +1636,19 @@ void CSteamNetworkingICESession::UpdateHostCandidates()
continue;
}
}
else
{
hostCandidateAddr.m_port = intf.m_pSocket->m_boundAddr.m_port;
}
if ( pAddedCandidate == nullptr )
pAddedCandidate = push_back_get_ptr( m_vecCandidates, ICECandidate( kICECandidateType_Host, hostCandidateAddr, hostCandidateAddr ) );
pAddedCandidate->m_nPriority = pAddedCandidate->CalcPriority( nLocalPriority );
if ( m_pCallbacks != nullptr )
m_pCallbacks->OnLocalCandidateDiscovered( *pAddedCandidate );
}
// Cancel all pending STUN requests that refer to interfaces that no longer exist.
// (Socket cleanup for disappeared interfaces is handled in GatherInterfaces.)
for ( int i = len( m_vecPendingServerReflexiveRequests ) - 1; i >= 0; )
{
SteamNetworkingIPAddr ifAddr = m_vecPendingServerReflexiveRequests[i]->m_localAddr;
@@ -1639,29 +1671,6 @@ void CSteamNetworkingICESession::UpdateHostCandidates()
m_vecPendingServerReflexiveRequests[i]->Cancel();
erase_at( m_vecPendingServerReflexiveRequests, i );
}
// Close all host candidate sockets that refer to interfaces that no longer exist.
for ( int i = len( m_vecHostCandidateSockets ) - 1; i >= 0; )
{
SteamNetworkingIPAddr ifAddr = m_vecHostCandidateSockets[i]->m_boundAddr;
ifAddr.m_port = 0;
bool bFound = false;
for ( const Interface& intf: m_vecInterfaces )
{
if ( intf.m_localaddr == ifAddr )
{
bFound = true;
break;
}
}
if ( bFound )
{
--i;
continue;
}
m_vecHostCandidateSockets[i]->Close();
erase_at( m_vecHostCandidateSockets, i );
}
}
bool CSteamNetworkingICESession::IsCandidatePermitted( const ICECandidate& localCandidate)
src/steamnetworkingsockets/clientlib/steamnetworkingsockets_ice_client.h
+21 -7
View File
@@ -195,10 +195,29 @@ namespace SteamNetworkingSocketsLib {
private:
struct Interface
{
// Local IP address of this network interface. Port is always 0;
// the actual bound port lives on m_pSocket.
SteamNetworkingIPAddr m_localaddr;
// Local-preference component of the ICE priority formula
// (RFC 8445 §5.1.2). Assigned as a countdown from 65535 in
// enumeration order so the first adapter returned by the OS gets
// the highest preference.
uint32 m_nPriority;
int m_nPrefixLen; // Subnet prefix length from adapter enumeration; 0 if unavailable
Interface( const SteamNetworkingIPAddr& ipAddr, uint32 p, int nPrefixLen ) : m_localaddr( ipAddr ), m_nPriority( p ), m_nPrefixLen( nPrefixLen ) {}
// Subnet prefix length from the OS adapter enumeration (e.g. 24
// for a /24 network). Used to detect same-LAN peers. 0 if the
// OS did not provide this information.
int m_nPrefixLen;
// Raw UDP socket bound to this interface for sending and receiving
// ICE traffic. Created in UpdateHostCandidates() the first time
// this interface is seen. Owned here; closed when the interface
// is removed from m_vecInterfaces.
IRawUDPSocket *m_pSocket;
Interface( const SteamNetworkingIPAddr& ipAddr, uint32 p, int nPrefixLen )
: m_localaddr( ipAddr ), m_nPriority( p ), m_nPrefixLen( nPrefixLen ), m_pSocket( nullptr ) {}
};
struct ICEPeerCandidate : public ICECandidate
@@ -304,11 +323,6 @@ namespace SteamNetworkingSocketsLib {
// m_bInterfaceListStale is set.
std_vector< Interface > m_vecInterfaces;
// Raw UDP sockets bound for host candidates, one per kICECandidateType_Host
// entry in m_vecCandidates. Kept alive for the session lifetime so incoming
// packets on any of these addresses are dispatched to us.
std_vector< IRawUDPSocket* > m_vecHostCandidateSockets;
// Resolved addresses of STUN servers, populated once at construction from the
// config string. Used to discover server-reflexive candidates and to dispatch
// STUN responses back to the correct server.