Sync up with Steam

No functional changes for opensource version of code.

P4:6571046

Author: zpostfacto

src/steamnetworkingsockets/clientlib/steamnetworkingsockets_lowlevel.cpp

@@ -2037,7 +2037,7 @@ IBoundUDPSocket *OpenUDPSocketBoundToHost( const netadr_t &adrRemote, CRecvPacke
 	// Select local address to use.
 	// Since we know the remote host, let's just always use a single-stack socket
 	// with the specified family
-	int nAddressFamilies = ( adrRemote.GetType() == NA_IPV6 ) ? k_nAddressFamily_IPv6 : k_nAddressFamily_IPv4;
+	int nAddressFamilies = ( adrRemote.GetType() == k_EIPTypeV6 ) ? k_nAddressFamily_IPv6 : k_nAddressFamily_IPv4;
 
 	// Create a socket, bind it to the desired local address
 	CDedicatedBoundSocket *pTempContext = nullptr; // don't yet know the context

src/steamnetworkingsockets/steamnetworkingsockets_thinker.cpp

@@ -58,7 +58,12 @@ IThinker::~IThinker()
 	#pragma GCC diagnostic ignored "-Wstrict-overflow"
 #endif
 
+#ifdef IS_STEAMDATAGRAMROUTER
+struct ShortDurationLock { inline void lock() {}; inline void unlock() {}; };
+static ShortDurationLock s_mutexThinkerTable;
+#else
 static ShortDurationLock s_mutexThinkerTable( "thinker" );
+#endif
 
 // Base class isn't lockable
 bool IThinker::TryLock() const { return true; }