FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

engine: fix wrong function called on closing socket on Win32

This commit is contained in:
Alibek Omarov 2019-07-30 18:41:24 +03:00
parent ca57c8424d
commit 386a68e334
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
engine/common/net_ws.c
View File

@ -94,6 +94,7 @@ static int ioctl_stub( int d, unsigned long r, ... )
#else // __EMSCRIPTEN__ #else // __EMSCRIPTEN__
#define ioctlsocket ioctl #define ioctlsocket ioctl
#endif // __EMSCRIPTEN__ #endif // __EMSCRIPTEN__
#define closesocket close
#define SOCKET int #define SOCKET int
#define INVALID_SOCKET -1 #define INVALID_SOCKET -1
typedef size_t WSAsize_t; typedef size_t WSAsize_t;
@ -1396,7 +1397,7 @@ static int NET_Isocket( const char *net_interface, int port, qboolean multicast
if( NET_IsSocketError( ioctlsocket( net_socket, FIONBIO, &_true ) ) ) if( NET_IsSocketError( ioctlsocket( net_socket, FIONBIO, &_true ) ) )
{ {
Con_DPrintf( S_WARN "NET_UDsocket: port: %d ioctl FIONBIO: %s\n", port, NET_ErrorString( )); Con_DPrintf( S_WARN "NET_UDsocket: port: %d ioctl FIONBIO: %s\n", port, NET_ErrorString( ));
close( net_socket ); closesocket( net_socket );
return INVALID_SOCKET; return INVALID_SOCKET;
} }
@ -1404,7 +1405,7 @@ static int NET_Isocket( const char *net_interface, int port, qboolean multicast
if( NET_IsSocketError( setsockopt( net_socket, SOL_SOCKET, SO_BROADCAST, (char *)&_true, sizeof( _true ) ) ) ) if( NET_IsSocketError( setsockopt( net_socket, SOL_SOCKET, SO_BROADCAST, (char *)&_true, sizeof( _true ) ) ) )
{ {
Con_DPrintf( S_WARN "NET_UDsocket: port: %d setsockopt SO_BROADCAST: %s\n", port, NET_ErrorString( )); Con_DPrintf( S_WARN "NET_UDsocket: port: %d setsockopt SO_BROADCAST: %s\n", port, NET_ErrorString( ));
close( net_socket ); closesocket( net_socket );
return INVALID_SOCKET; return INVALID_SOCKET;
} }
@ -1413,7 +1414,7 @@ static int NET_Isocket( const char *net_interface, int port, qboolean multicast
if( NET_IsSocketError( setsockopt( net_socket, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, sizeof( optval )) ) ) if( NET_IsSocketError( setsockopt( net_socket, SOL_SOCKET, SO_REUSEADDR, (const char *)&optval, sizeof( optval )) ) )
{ {
Con_DPrintf( S_WARN "NET_UDsocket: port: %d setsockopt SO_REUSEADDR: %s\n", port, NET_ErrorString( )); Con_DPrintf( S_WARN "NET_UDsocket: port: %d setsockopt SO_REUSEADDR: %s\n", port, NET_ErrorString( ));
close( net_socket ); closesocket( net_socket );
return INVALID_SOCKET; return INVALID_SOCKET;
} }
} }
@ -1428,7 +1429,7 @@ static int NET_Isocket( const char *net_interface, int port, qboolean multicast
err = WSAGetLastError(); err = WSAGetLastError();
if( err != WSAENOPROTOOPT ) if( err != WSAENOPROTOOPT )
Con_Printf( S_WARN "NET_UDsocket: port: %d setsockopt IP_TOS: %s\n", port, NET_ErrorString( )); Con_Printf( S_WARN "NET_UDsocket: port: %d setsockopt IP_TOS: %s\n", port, NET_ErrorString( ));
close( net_socket ); closesocket( net_socket );
return INVALID_SOCKET; return INVALID_SOCKET;
} }
} }
@ -1445,7 +1446,7 @@ static int NET_Isocket( const char *net_interface, int port, qboolean multicast
if( NET_IsSocketError( bind( net_socket, (void *)&addr, sizeof( addr )) ) ) if( NET_IsSocketError( bind( net_socket, (void *)&addr, sizeof( addr )) ) )
{ {
Con_DPrintf( S_WARN "NET_UDsocket: port: %d bind: %s\n", port, NET_ErrorString( )); Con_DPrintf( S_WARN "NET_UDsocket: port: %d bind: %s\n", port, NET_ErrorString( ));
close( net_socket ); closesocket( net_socket );
return INVALID_SOCKET; return INVALID_SOCKET;
} }
@ -1596,7 +1597,7 @@ void NET_Config( qboolean multiplayer )
{ {
if( net.ip_sockets[i] != INVALID_SOCKET ) if( net.ip_sockets[i] != INVALID_SOCKET )
{ {
close( net.ip_sockets[i] ); closesocket( net.ip_sockets[i] );
net.ip_sockets[i] = INVALID_SOCKET; net.ip_sockets[i] = INVALID_SOCKET;
} }
} }
@ -1856,7 +1857,7 @@ static void HTTP_FreeFile( httpfile_t *file, qboolean error )
file->file = NULL; file->file = NULL;
if( file->socket != -1 ) if( file->socket != -1 )
close( file->socket ); closesocket( file->socket );
file->socket = -1; file->socket = -1;