RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-11 14:42:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

engine: server: add function SV_HavePassword that correctly checks whether this server have set up password

Browse Source
This commit is contained in:
Alibek Omarov
2024-07-07 02:10:48 +03:00
parent b6967a432a
commit dc6f03b4e4
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/sv_client.c
+21 -5
View File
@@ -45,6 +45,20 @@ static int g_userid = 1;
static void SV_UserinfoChanged( sv_client_t *cl );
static void SV_ExecuteClientCommand( sv_client_t *cl, const char *s );
/*
=================
SV_HavePassword
=================
*/
qboolean SV_HavePassword( void )
{
if( COM_CheckStringEmpty( sv_password.string ) && Q_stricmp( sv_password.string, "none" ))
return true;
return false;
}
/*
=================
SV_GetPlayerCount
@@ -370,10 +384,13 @@ static void SV_ConnectClient( netadr_t from )
Q_strncpy( userinfo, s, sizeof( userinfo ));
// check connection password (don't verify local client)
if( !NET_IsLocalAddress( from ) && sv_password.string[0] && Q_stricmp( sv_password.string, Info_ValueForKey( userinfo, "password" )))
if( !NET_IsLocalAddress( from ) && SV_HavePassword( ))
{
SV_RejectConnection( from, "invalid password\n" );
return;
if( Q_stricmp( sv_password.string, Info_ValueForKey( userinfo, "password" )))
{
SV_RejectConnection( from, "invalid password\n" );
return;
}
}
// if there is already a slot for this ip, reuse it
@@ -915,7 +932,6 @@ static void SV_Info( netadr_t from, int protocolVersion )
int bots;
int remaining;
char temp[sizeof( s )];
qboolean have_password = COM_CheckStringEmpty( sv_password.string );
SV_GetPlayerCount( &count, &bots );
@@ -928,7 +944,7 @@ static void SV_Info( netadr_t from, int protocolVersion )
Info_SetValueForKeyf( s, "numcl", sizeof( s ), "%i", count );
Info_SetValueForKeyf( s, "maxcl", sizeof( s ), "%i", svs.maxclients );
Info_SetValueForKey( s, "gamedir", GI->gamefolder, sizeof( s ));
Info_SetValueForKey( s, "password", have_password ? "1" : "0", sizeof( s ));
Info_SetValueForKey( s, "password", SV_HavePassword() ? "1" : "0", sizeof( s ));
// write host last so we can try to cut off too long hostnames
// TODO: value size limit for infostrings