YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

engine: network: reenable DNS resolving in separate thread for Windows

Browse Source
This commit is contained in:
Alibek Omarov 2023-01-13 08:09:16 +03:00
parent 171c0c8d3b
commit 1119a9ac22
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
engine/common/net_ws.c
View File

@ -356,9 +356,9 @@ qboolean NET_GetHostByName( const char *hostname, int family, struct sockaddr_st
#endif #endif
} }
#if !defined XASH_NO_ASYNC_NS_RESOLVE && ( XASH_WIN32 || !( XASH_EMSCRIPTEN || XASH_DOS4GW )) #if !XASH_EMSCRIPTEN && !XASH_DOS4GW && !defined XASH_NO_ASYNC_NS_RESOLVE
#define CAN_ASYNC_NS_RESOLVE #define CAN_ASYNC_NS_RESOLVE
#endif #endif // !XASH_EMSCRIPTEN && !XASH_DOS4GW && !defined XASH_NO_ASYNC_NS_RESOLVE
#ifdef CAN_ASYNC_NS_RESOLVE #ifdef CAN_ASYNC_NS_RESOLVE
static void NET_ResolveThread( void ); static void NET_ResolveThread( void );
@ -387,7 +387,7 @@ void *NET_ThreadStart( void *unused )
DWORD WINAPI NET_ThreadStart( LPVOID unused ) DWORD WINAPI NET_ThreadStart( LPVOID unused )
{ {
NET_ResolveThread(); NET_ResolveThread();
ExitThread(0); ExitThread( 0 );
return 0; return 0;
} }
#endif // !_WIN32 #endif // !_WIN32
@ -414,14 +414,14 @@ static struct nsthread_s
#endif #endif
; ;
#if XASH_WIN32
static void NET_InitializeCriticalSections( void ) static void NET_InitializeCriticalSections( void )
{ {
net.threads_initialized = true; net.threads_initialized = true;
pInitializeCriticalSection( &nsthread.mutexns ); #if XASH_WIN32
pInitializeCriticalSection( &nsthread.mutexres ); InitializeCriticalSection( &nsthread.mutexns );
} InitializeCriticalSection( &nsthread.mutexres );
#endif #endif
}
void NET_ResolveThread( void ) void NET_ResolveThread( void )
{ {
@ -2176,9 +2176,10 @@ void NET_Init( void )
Con_DPrintf( S_ERROR "network initialization failed.\n" ); Con_DPrintf( S_ERROR "network initialization failed.\n" );
return; return;
} }
#else #endif
// we have pthreads by default
net.threads_initialized = true; #ifdef CAN_ASYNC_NS_RESOLVE
NET_InitializeCriticalSections();
#endif #endif
net.allow_ip = !Sys_CheckParm( "-noip" ); net.allow_ip = !Sys_CheckParm( "-noip" );