vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: common: net_ws: minor refactoring

Browse source
This commit is contained in:
Alibek Omarov 2024-10-02 23:25:12 +03:00
parent a1060b0eb5
commit 2ecae442fc
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
engine/common/net_ws.c
View file

@ -131,6 +131,8 @@ static CVAR_DEFINE( net_ip6hostport, "ip6_hostport", "0", FCVAR_READ_ONLY, "netw
static CVAR_DEFINE( net_ip6clientport, "ip6_clientport", "0", FCVAR_READ_ONLY, "network ip6 client port" ); static CVAR_DEFINE( net_ip6clientport, "ip6_clientport", "0", FCVAR_READ_ONLY, "network ip6 client port" );
static CVAR_DEFINE_AUTO( net6_address, "0", FCVAR_PRIVILEGED|FCVAR_READ_ONLY, "contain local IPv6 address of current client" ); static CVAR_DEFINE_AUTO( net6_address, "0", FCVAR_PRIVILEGED|FCVAR_READ_ONLY, "contain local IPv6 address of current client" );
static void NET_ClearLagData( qboolean bClient, qboolean bServer );
/* /*
==================== ====================
NET_ErrorString NET_ErrorString
@ -197,7 +199,7 @@ static char *NET_ErrorString( void )
#endif #endif
} }
_inline socklen_t NET_SockAddrLen( const struct sockaddr_storage *addr ) static inline socklen_t NET_SockAddrLen( const struct sockaddr_storage *addr )
{ {
switch ( addr->ss_family ) switch ( addr->ss_family )
{ {
@ -210,7 +212,7 @@ _inline socklen_t NET_SockAddrLen( const struct sockaddr_storage *addr )
} }
} }
_inline qboolean NET_IsSocketError( int retval ) static inline qboolean NET_IsSocketError( int retval )
{ {
#if XASH_WIN32 || XASH_DOS4GW #if XASH_WIN32 || XASH_DOS4GW
return retval == SOCKET_ERROR ? true : false; return retval == SOCKET_ERROR ? true : false;
@ -219,7 +221,7 @@ _inline qboolean NET_IsSocketError( int retval )
#endif #endif
} }
_inline qboolean NET_IsSocketValid( int socket ) static inline qboolean NET_IsSocketValid( int socket )
{ {
#if XASH_WIN32 || XASH_DOS4GW #if XASH_WIN32 || XASH_DOS4GW
return socket != INVALID_SOCKET; return socket != INVALID_SOCKET;
@ -460,7 +462,7 @@ static void NET_DeleteCriticalSections( void )
memset( &nsthread, 0, sizeof( nsthread )); memset( &nsthread, 0, sizeof( nsthread ));
} }
void NET_ResolveThread( void ) static void NET_ResolveThread( void )
{ {
struct sockaddr_storage addr; struct sockaddr_storage addr;
qboolean res; qboolean res;
@ -579,21 +581,17 @@ static net_gai_state_t NET_StringToSockaddr( const char *s, struct sockaddr_stor
asyncfailed = false; asyncfailed = false;
return NET_EAI_AGAIN; return NET_EAI_AGAIN;
} }
else // failed to create thread
{
Con_Reportf( S_ERROR "%s: failed to create thread!\n", __func__ ); Con_Reportf( S_ERROR "%s: failed to create thread!\n", __func__ );
nsthread.busy = false; nsthread.busy = false;
} }
}
mutex_unlock( nsthread.mutexres ); mutex_unlock( nsthread.mutexres );
} }
#endif // CAN_ASYNC_NS_RESOLVE #endif // CAN_ASYNC_NS_RESOLVE
if( asyncfailed ) if( asyncfailed )
{
ret = NET_GetHostByName( copy, family, &temp ); ret = NET_GetHostByName( copy, family, &temp );
}
if( !ret ) if( !ret )
{ {
@ -2106,7 +2104,7 @@ NET_ClearLagData
clear fakelag list clear fakelag list
==================== ====================
*/ */
void NET_ClearLagData( qboolean bClient, qboolean bServer ) static void NET_ClearLagData( qboolean bClient, qboolean bServer )
{ {
if( bClient ) NET_ClearLaggedList( &net.lagdata[NS_CLIENT] ); if( bClient ) NET_ClearLaggedList( &net.lagdata[NS_CLIENT] );
if( bServer ) NET_ClearLaggedList( &net.lagdata[NS_SERVER] ); if( bServer ) NET_ClearLaggedList( &net.lagdata[NS_SERVER] );

1
engine/common/net_ws.h
View file

@ -74,7 +74,6 @@ qboolean NET_CompareAdrByMask( const netadr_t a, const netadr_t b, uint prefixle
qboolean NET_GetPacket( netsrc_t sock, netadr_t *from, byte *data, size_t *length ); qboolean NET_GetPacket( netsrc_t sock, netadr_t *from, byte *data, size_t *length );
void NET_SendPacket( netsrc_t sock, size_t length, const void *data, netadr_t to ); void NET_SendPacket( netsrc_t sock, size_t length, const void *data, netadr_t to );
void NET_SendPacketEx( netsrc_t sock, size_t length, const void *data, netadr_t to, size_t splitsize ); void NET_SendPacketEx( netsrc_t sock, size_t length, const void *data, netadr_t to, size_t splitsize );
void NET_ClearLagData( qboolean bClient, qboolean bServer );
void NET_IP6BytesToNetadr( netadr_t *adr, const uint8_t *ip6 ); void NET_IP6BytesToNetadr( netadr_t *adr, const uint8_t *ip6 );
void NET_NetadrToIP6Bytes( uint8_t *ip6, const netadr_t *adr ); void NET_NetadrToIP6Bytes( uint8_t *ip6, const netadr_t *adr );