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

engine: common: net_ws: backported NAT bypass feature

This commit is contained in:
SNMetamorph 2022-07-10 02:07:25 +04:00 committed by a1batross
parent 8f91830997
commit 6891ed8064
1 changed files with 45 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
engine/common/net_ws.c
View File

@ -1472,35 +1472,71 @@ static int NET_IPSocket( const char *net_interface, int port, qboolean multicast
NET_OpenIP NET_OpenIP
==================== ====================
*/ */
static void NET_OpenIP( void ) static void NET_OpenIP( qboolean change_port )
{ {
int port, sv_port = 0, cl_port = 0; int port;
qboolean sv_nat = Cvar_VariableInteger("sv_nat");
qboolean cl_nat = Cvar_VariableInteger("cl_nat");
if( change_port && ( FBitSet( net_hostport->flags, FCVAR_CHANGED ) || sv_nat ))
{
// reopen socket to set random port
if( NET_IsSocketValid( net.ip_sockets[NS_SERVER] ))
closesocket( net.ip_sockets[NS_SERVER] );
net.ip_sockets[NS_SERVER] = 0;
ClearBits( net_hostport->flags, FCVAR_CHANGED );
}
if( !NET_IsSocketValid( net.ip_sockets[NS_SERVER] ) ) if( !NET_IsSocketValid( net.ip_sockets[NS_SERVER] ) )
{ {
port = net_iphostport->value; port = net_iphostport->value;
if( !port ) port = net_hostport->value; if( !port )
if( !port ) port = PORT_SERVER; // forcing to default {
if( sv_nat )
port = PORT_ANY;
else
port = net_hostport->value;
if( !port )
port = PORT_SERVER; // forcing to default
}
net.ip_sockets[NS_SERVER] = NET_IPSocket( net_ipname->string, port, false ); net.ip_sockets[NS_SERVER] = NET_IPSocket( net_ipname->string, port, false );
if( !NET_IsSocketValid( net.ip_sockets[NS_SERVER] ) && Host_IsDedicated() ) if( !NET_IsSocketValid( net.ip_sockets[NS_SERVER] ) && Host_IsDedicated() )
Host_Error( "Couldn't allocate dedicated server IP port %d.\n", port ); Host_Error( "Couldn't allocate dedicated server IP port %d.\n", port );
sv_port = port;
} }
// dedicated servers don't need client ports // dedicated servers don't need client ports
if( Host_IsDedicated() ) return; if( Host_IsDedicated() ) return;
if (change_port && ( FBitSet( net_clientport->flags, FCVAR_CHANGED ) || cl_nat ))
{
// reopen socket to set random port
if( NET_IsSocketValid(net.ip_sockets[NS_CLIENT] ))
closesocket( net.ip_sockets[NS_CLIENT] );
net.ip_sockets[NS_CLIENT] = 0;
ClearBits( net_clientport->flags, FCVAR_CHANGED );
}
if( !NET_IsSocketValid( net.ip_sockets[NS_CLIENT] ) ) if( !NET_IsSocketValid( net.ip_sockets[NS_CLIENT] ) )
{ {
port = net_ipclientport->value; port = net_ipclientport->value;
if( !port ) port = net_clientport->value; if( !port )
if( !port ) port = PORT_ANY; // forcing to default {
if( cl_nat )
port = PORT_ANY;
else
port = net_clientport->value;
if( !port )
port = PORT_ANY; // forcing to default
}
net.ip_sockets[NS_CLIENT] = NET_IPSocket( net_ipname->string, port, false ); net.ip_sockets[NS_CLIENT] = NET_IPSocket( net_ipname->string, port, false );
if( !NET_IsSocketValid( net.ip_sockets[NS_CLIENT] ) ) if( !NET_IsSocketValid( net.ip_sockets[NS_CLIENT] ) )
net.ip_sockets[NS_CLIENT] = NET_IPSocket( net_ipname->string, PORT_ANY, false ); net.ip_sockets[NS_CLIENT] = NET_IPSocket( net_ipname->string, PORT_ANY, false );
cl_port = port;
} }
} }
@ -1586,7 +1622,7 @@ void NET_Config( qboolean multiplayer, qboolean changeport )
if( multiplayer ) if( multiplayer )
{ {
// open sockets // open sockets
if( net.allow_ip ) NET_OpenIP(); if( net.allow_ip ) NET_OpenIP( changeport );
// get our local address, if possible // get our local address, if possible
if( bFirst ) if( bFirst )