{CVAR_SAVE, "sv_master4", "", "user-chosen master server 4"},
{0, "sv_masterextra1", "ghdigital.com", "default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc
{0, "sv_masterextra2", "dpmaster.deathmask.net", "default master server 2 (admin: Willis)"}, // admin: Willis
- {0, "sv_masterextra3", "excalibur.nvg.ntnu.no", "default master server 3 (admin: tChr)"}, // admin: tChr
+ {0, "sv_masterextra3", "dpmaster.tchr.no", "default master server 3 (admin: tChr)"}, // admin: tChr
{0, NULL, NULL, NULL}
};
{CVAR_SAVE, "sv_qwmaster2", "", "user-chosen qwmaster server 2"},
{CVAR_SAVE, "sv_qwmaster3", "", "user-chosen qwmaster server 3"},
{CVAR_SAVE, "sv_qwmaster4", "", "user-chosen qwmaster server 4"},
- {0, "sv_qwmasterextra1", "192.246.40.37:27000", "id Limbo (admin: id Software)"},
- {0, "sv_qwmasterextra2", "192.246.40.37:27002", "id CTF (admin: id Software)"},
- {0, "sv_qwmasterextra3", "192.246.40.37:27003", "id TeamFortress (admin: id Software)"},
- {0, "sv_qwmasterextra4", "192.246.40.37:27004", "id Miscilaneous (admin: id Software)"},
- {0, "sv_qwmasterextra5", "192.246.40.37:27006", "id Deathmatch Only (admin: id Software)"},
- {0, "sv_qwmasterextra6", "150.254.66.120:27000", "Poland's master server. (admin: unknown)"},
- {0, "sv_qwmasterextra7", "62.112.145.129:27000", "Ocrana master server. (admin: unknown)"},
- {0, "sv_qwmasterextra8", "master.edome.net", "edome master server. (admin: unknown)"},
- {0, "sv_qwmasterextra9", "qwmaster.barrysworld.com", "barrysworld master server. (admin: unknown)"},
- {0, "sv_qwmasterextra10", "qwmaster.ocrana.de:27000", "Ocrana2 master server. (admin: unknown)"},
- {0, "sv_qwmasterextra11", "213.221.174.165:27000", "unknown1 master server. (admin: unknown)"},
- {0, "sv_qwmasterextra12", "195.74.0.8", "unknown2 master server. (admin: unknown)"},
- {0, "sv_qwmasterextra13", "204.182.161.2", "unknown3 master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra1", "master.quakeservers.net:27000", "Global master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra2", "asgaard.morphos-team.net:27000", "Global master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra3", "qwmaster.ocrana.de:27000", "German master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra4", "masterserver.exhale.de:27000", "German master server. (admin: unknown)"},
+ {0, "sv_qwmasterextra5", "kubus.rulez.pl:27000", "Poland master server. (admin: unknown)"},
{0, NULL, NULL, NULL}
};
static cvar_t net_slist_queriespersecond = {0, "net_slist_queriespersecond", "20", "how many server information requests to send per second"};
static cvar_t net_slist_queriesperframe = {0, "net_slist_queriesperframe", "4", "maximum number of server information requests to send each rendered frame (guards against low framerates causing problems)"};
static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4", "how long to listen for a server information response before giving up"};
+static cvar_t net_slist_pause = {0, "net_slist_pause", "0", "when set to 1, the server list won't update until it is set back to 0"};
static cvar_t net_slist_maxtries = {0, "net_slist_maxtries", "3", "how many times to ask the same server for information (more times gives better ping reports but takes longer)"};
+static cvar_t net_slist_favorites = {CVAR_SAVE, "net_slist_favorites", "", "contains a list of IP addresses and ports to always query explicitly"};
static cvar_t gameversion = {0, "gameversion", "0", "version of game data (mod-specific), when client and server gameversion mismatch in the server browser the server is shown as incompatible"};
+static cvar_t rcon_restricted_password = {CVAR_PRIVATE, "rcon_restricted_password", "", "password to authenticate rcon commands in restricted mode"};
+static cvar_t rcon_restricted_commands = {0, "rcon_restricted_commands", "", "allowed commands for rcon when the restricted mode password was used"};
/* statistic counters */
static int packetsSent = 0;
// this is only false if there are still servers left to query
static qboolean serverlist_querysleep = true;
+static qboolean serverlist_paused = false;
// this is pushed a second or two ahead of realtime whenever a master server
// reply is received, to avoid issuing queries while master replies are still
// flooding in (which would make a mess of the ping times)
serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
serverlist_infofield_t serverlist_sortbyfield;
-qboolean serverlist_sortdescending;
+int serverlist_sortflags;
int serverlist_viewcount = 0;
serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
{
int result = 0; // > 0 if for numbers A > B and for text if A < B
+ if( serverlist_sortflags & SLSF_FAVORITESFIRST )
+ {
+ if(A->info.isfavorite != B->info.isfavorite)
+ return A->info.isfavorite;
+ }
+
switch( serverlist_sortbyfield ) {
case SLIF_PING:
result = A->info.ping - B->info.ping;
result = strcmp( B->info.cname, A->info.cname );
break;
case SLIF_GAME:
- result = strcmp( B->info.game, A->info.game );
+ result = strcasecmp( B->info.game, A->info.game );
break;
case SLIF_MAP:
- result = strcmp( B->info.map, A->info.map );
+ result = strcasecmp( B->info.map, A->info.map );
break;
case SLIF_MOD:
- result = strcmp( B->info.mod, A->info.mod );
+ result = strcasecmp( B->info.mod, A->info.mod );
break;
case SLIF_NAME:
- result = strcmp( B->info.name, A->info.name );
+ result = strcasecmp( B->info.name, A->info.name );
+ break;
+ case SLIF_QCSTATUS:
+ result = strcasecmp( B->info.qcstatus, A->info.qcstatus ); // not really THAT useful, though
+ break;
+ case SLIF_ISFAVORITE:
+ result = !!B->info.isfavorite - !!A->info.isfavorite;
break;
default:
Con_DPrint( "_ServerList_Entry_Compare: Bad serverlist_sortbyfield!\n" );
break;
}
- if( serverlist_sortdescending )
- return result > 0;
if (result != 0)
- return result < 0;
+ {
+ if( serverlist_sortflags & SLSF_DESCENDING )
+ return result > 0;
+ else
+ return result < 0;
+ }
+
// if the chosen sort key is identical, sort by index
// (makes this a stable sort, so that later replies from servers won't
// shuffle the servers around when they have the same ping)
case SLMO_GREATEREQUAL:
case SLMO_CONTAINS:
case SLMO_NOTCONTAIN:
+ case SLMO_STARTSWITH:
+ case SLMO_NOTSTARTSWITH:
return A >= B;
default:
Con_DPrint( "_ServerList_CompareInt: Bad op!\n" );
static qboolean _ServerList_CompareStr( const char *A, serverlist_maskop_t op, const char *B )
{
int i;
- char bufferA[ 256 ], bufferB[ 256 ]; // should be more than enough
- for (i = 0;i < (int)sizeof(bufferA)-1 && A[i];i++)
- bufferA[i] = (A[i] >= 'A' && A[i] <= 'Z') ? (A[i] + 'a' - 'A') : A[i];
+ char bufferA[ 1400 ], bufferB[ 1400 ]; // should be more than enough
+ COM_StringDecolorize(A, 0, bufferA, sizeof(bufferA), false);
+ for (i = 0;i < (int)sizeof(bufferA)-1 && bufferA[i];i++)
+ bufferA[i] = (bufferA[i] >= 'A' && bufferA[i] <= 'Z') ? (bufferA[i] + 'a' - 'A') : bufferA[i];
bufferA[i] = 0;
for (i = 0;i < (int)sizeof(bufferB)-1 && B[i];i++)
bufferB[i] = (B[i] >= 'A' && B[i] <= 'Z') ? (B[i] + 'a' - 'A') : B[i];
return *bufferB && !!strstr( bufferA, bufferB ); // we want a real bool
case SLMO_NOTCONTAIN:
return !*bufferB || !strstr( bufferA, bufferB );
+ case SLMO_STARTSWITH:
+ //Con_Printf("startsWith: %s %s\n", bufferA, bufferB);
+ return *bufferB && !memcmp(bufferA, bufferB, strlen(bufferB));
+ case SLMO_NOTSTARTSWITH:
+ return !*bufferB || memcmp(bufferA, bufferB, strlen(bufferB));
case SLMO_LESS:
return strcmp( bufferA, bufferB ) < 0;
case SLMO_LESSEQUAL:
if( *mask->info.name
&& !_ServerList_CompareStr( info->name, mask->tests[SLIF_NAME], mask->info.name ) )
return false;
+ if( *mask->info.qcstatus
+ && !_ServerList_CompareStr( info->qcstatus, mask->tests[SLIF_QCSTATUS], mask->info.qcstatus ) )
+ return false;
+ if( *mask->info.players
+ && !_ServerList_CompareStr( info->players, mask->tests[SLIF_PLAYERS], mask->info.players ) )
+ return false;
+ if( !_ServerList_CompareInt( info->isfavorite, mask->tests[SLIF_ISFAVORITE], mask->info.isfavorite ))
+ return false;
return true;
}
static void ServerList_ViewList_Insert( serverlist_entry_t *entry )
{
int start, end, mid;
+ const char *text;
// reject incompatible servers
if (entry->info.gameversion != gameversion.integer)
return;
+ // refresh the "favorite" status
+ text = net_slist_favorites.string;
+ entry->info.isfavorite = false;
+ while(COM_ParseToken_Console(&text))
+ {
+ if(!strcmp(com_token, entry->info.cname))
+ {
+ entry->info.isfavorite = true;
+ break;
+ }
+ }
+
// FIXME: change this to be more readable (...)
// now check whether it passes through the masks
- for( start = 0 ; serverlist_andmasks[start].active && start < SERVERLIST_ANDMASKCOUNT ; start++ )
+ for( start = 0 ; start < SERVERLIST_ANDMASKCOUNT && serverlist_andmasks[start].active; start++ )
if( !_ServerList_Entry_Mask( &serverlist_andmasks[start], &entry->info ) )
return;
- for( start = 0 ; serverlist_ormasks[start].active && start < SERVERLIST_ORMASKCOUNT ; start++ )
+ for( start = 0 ; start < SERVERLIST_ORMASKCOUNT && serverlist_ormasks[start].active ; start++ )
if( _ServerList_Entry_Mask( &serverlist_ormasks[start], &entry->info ) )
break;
if( start == SERVERLIST_ORMASKCOUNT || (start > 0 && !serverlist_ormasks[start].active) )
serverlist_ormasks[i].info.numbots = -1;
}
+void ServerList_GetPlayerStatistics(int *numplayerspointer, int *maxplayerspointer)
+{
+ int i;
+ int numplayers = 0, maxplayers = 0;
+ for (i = 0;i < serverlist_cachecount;i++)
+ {
+ if (serverlist_cache[i].query == SQS_QUERIED)
+ {
+ numplayers += serverlist_cache[i].info.numhumans;
+ maxplayers += serverlist_cache[i].info.maxplayers;
+ }
+ }
+ *numplayerspointer = numplayers;
+ *maxplayerspointer = maxplayers;
+}
+
#if 0
static void _ServerList_Test(void)
{
serverlist_cache[serverlist_cachecount].info.ping = 1000 + 1024 - i;
dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, sizeof(serverlist_cache[serverlist_cachecount].info.name), "Black's ServerList Test %i", i );
serverlist_cache[serverlist_cachecount].finished = true;
- sprintf( serverlist_cache[serverlist_cachecount].line1, "%i %s", serverlist_cache[serverlist_cachecount].info.ping, serverlist_cache[serverlist_cachecount].info.name );
+ dpsnprintf( serverlist_cache[serverlist_cachecount].line1, sizeof(serverlist_cache[serverlist_cachecount].info.line1), "%i %s", serverlist_cache[serverlist_cachecount].info.ping, serverlist_cache[serverlist_cachecount].info.name );
ServerList_ViewList_Insert( &serverlist_cache[serverlist_cachecount] );
serverlist_cachecount++;
}
sendreliable = true;
}
// outgoing unreliable packet number, and outgoing reliable packet number (0 or 1)
- *((int *)(sendbuffer + 0)) = LittleLong((unsigned int)conn->qw.outgoing_sequence | ((unsigned int)sendreliable<<31));
+ *((int *)(sendbuffer + 0)) = LittleLong((unsigned int)conn->outgoing_unreliable_sequence | ((unsigned int)sendreliable<<31));
// last received unreliable packet number, and last received reliable packet number (0 or 1)
*((int *)(sendbuffer + 4)) = LittleLong((unsigned int)conn->qw.incoming_sequence | ((unsigned int)conn->qw.incoming_reliable_sequence<<31));
packetLen = 8;
- conn->qw.outgoing_sequence++;
+ conn->outgoing_unreliable_sequence++;
// client sends qport in every packet
if (conn == cls.netcon)
{
*((short *)(sendbuffer + 8)) = LittleShort(cls.qw_qport);
packetLen += 2;
// also update cls.qw_outgoing_sequence
- cls.qw_outgoing_sequence = conn->qw.outgoing_sequence;
+ cls.qw_outgoing_sequence = conn->outgoing_unreliable_sequence;
}
if (packetLen + (sendreliable ? conn->sendMessageLength : 0) > 1400)
{
conn->outgoing_reliablesize[conn->outgoing_packetcounter] += conn->sendMessageLength;
memcpy(sendbuffer + packetLen, conn->sendMessage, conn->sendMessageLength);
packetLen += conn->sendMessageLength;
- conn->qw.last_reliable_sequence = conn->qw.outgoing_sequence;
+ conn->qw.last_reliable_sequence = conn->outgoing_unreliable_sequence;
}
// add the unreliable message if possible
header = (unsigned int *)sendbuffer;
header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE);
- header[1] = BigLong(conn->nq.unreliableSendSequence);
+ header[1] = BigLong(conn->outgoing_unreliable_sequence);
memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize);
- conn->nq.unreliableSendSequence++;
+ conn->outgoing_unreliable_sequence++;
conn->outgoing_unreliablesize[conn->outgoing_packetcounter] += packetLen;
port = bound(0, cl_netport.integer, 65535);
if (cl_netport.integer != port)
Cvar_SetValueQuick(&cl_netport, port);
- Con_Printf("Client using port %i\n", port);
+ if(port == 0)
+ Con_Printf("Client using an automatically assigned port\n");
+ else
+ Con_Printf("Client using port %i\n", port);
NetConn_OpenClientPort("local:2", 0);
NetConn_OpenClientPort(net_address.string, port);
//NetConn_OpenClientPort(net_address_ipv6.string, port);
unsigned int *header;
conn->sendMessageLength -= MAX_PACKETFRAGMENT;
- memcpy(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength);
+ memmove(conn->sendMessage, conn->sendMessage+MAX_PACKETFRAGMENT, conn->sendMessageLength);
if (conn->sendMessageLength <= MAX_PACKETFRAGMENT)
{
cls.signon = 0; // need all the signon messages before playing
cls.protocol = initialprotocol;
// reset move sequence numbering on this new connection
- cls.movesequence = 1;
cls.servermovesequence = 0;
if (cls.protocol == PROTOCOL_QUAKEWORLD)
Cmd_ForwardStringToServer("new");
{
int n;
int pingtime;
- serverlist_entry_t *entry;
+ serverlist_entry_t *entry = NULL;
// search the cache for this server and update it
for (n = 0;n < serverlist_cachecount;n++) {
if (serverlist_consoleoutput)
Con_Printf("querying %s\n", addressstring);
++serverlist_cachecount;
+
+#if 0
+ // we should not NEED this part...
+ text = net_slist_favorites.string;
+ while(COM_ParseToken_Console(&text))
+ {
+ if(!strcmp(com_token, addressstring))
+ entry->isfavorite = 1;
+ }
+#endif
}
// if this is the first reply from this server, count it as having replied
pingtime = (int)((realtime - entry->querytime) * 1000.0 + 0.5);
dpsnprintf(entry->line1, sizeof(serverlist_cache[n].line1), "^%c%5d^7 ^%c%3u^7/%3u %-65.65s", info->ping >= 300 ? '1' : (info->ping >= 200 ? '3' : '7'), (int)info->ping, ((info->numhumans > 0 && info->numhumans < info->maxplayers) ? (info->numhumans >= 4 ? '7' : '3') : '1'), info->numplayers, info->maxplayers, info->name);
dpsnprintf(entry->line2, sizeof(serverlist_cache[n].line2), "^4%-21.21s %-19.19s ^%c%-17.17s^4 %-20.20s", info->cname, info->game, (info->gameversion != gameversion.integer) ? '1' : '4', info->mod, info->map);
if (entry->query == SQS_QUERIED)
- ServerList_ViewList_Remove(entry);
+ {
+ if(!serverlist_paused)
+ ServerList_ViewList_Remove(entry);
+ }
// if not in the slist menu we should print the server to console (if wanted)
else if( serverlist_consoleoutput )
Con_Printf("%s\n%s\n", serverlist_cache[n].line1, serverlist_cache[n].line2);
// and finally, update the view set
- ServerList_ViewList_Insert( entry );
+ if(!serverlist_paused)
+ ServerList_ViewList_Insert( entry );
// update the entry's state
serverlist_cache[n].query = SQS_QUERIED;
}
// returns true, if it's sensible to continue the processing
-static qboolean NetConn_ClientParsePacket_ServerList_PrepareQuery( int protocol, const char *ipstring ) {
+static qboolean NetConn_ClientParsePacket_ServerList_PrepareQuery( int protocol, const char *ipstring, qboolean isfavorite ) {
int n;
serverlist_entry_t *entry;
entry->protocol = protocol;
// store the data the engine cares about (address and ping)
strlcpy (entry->info.cname, ipstring, sizeof(entry->info.cname));
+
+ entry->info.isfavorite = isfavorite;
// no, then reset the ping right away
entry->info.ping = -1;
M_Update_Return_Reason(rejectreason);
return true;
}
+ if (length >= 15 && !memcmp(string, "statusResponse\x0A", 15))
+ {
+ serverlist_info_t *info;
+ char *p;
+ int n;
+
+ string += 15;
+ // search the cache for this server and update it
+ n = NetConn_ClientParsePacket_ServerList_ProcessReply(addressstring2);
+ if (n < 0)
+ return true;
+
+ info = &serverlist_cache[n].info;
+ info->game[0] = 0;
+ info->mod[0] = 0;
+ info->map[0] = 0;
+ info->name[0] = 0;
+ info->qcstatus[0] = 0;
+ info->players[0] = 0;
+ info->protocol = -1;
+ info->numplayers = 0;
+ info->numbots = -1;
+ info->maxplayers = 0;
+ info->gameversion = 0;
+
+ p = strchr(string, '\n');
+ if(p)
+ {
+ *p = 0; // cut off the string there
+ ++p;
+ }
+ else
+ Con_Printf("statusResponse without players block?\n");
+
+ if ((s = SearchInfostring(string, "gamename" )) != NULL) strlcpy(info->game, s, sizeof (info->game));
+ if ((s = SearchInfostring(string, "modname" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));
+ if ((s = SearchInfostring(string, "mapname" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));
+ if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(info->name, s, sizeof (info->name));
+ if ((s = SearchInfostring(string, "protocol" )) != NULL) info->protocol = atoi(s);
+ if ((s = SearchInfostring(string, "clients" )) != NULL) info->numplayers = atoi(s);
+ if ((s = SearchInfostring(string, "bots" )) != NULL) info->numbots = atoi(s);
+ if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) info->maxplayers = atoi(s);
+ if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);
+ if ((s = SearchInfostring(string, "qcstatus" )) != NULL) strlcpy(info->qcstatus, s, sizeof(info->qcstatus));
+ if (p != NULL) strlcpy(info->players, p, sizeof(info->players));
+ info->numhumans = info->numplayers - max(0, info->numbots);
+ info->freeslots = info->maxplayers - info->numplayers;
+
+ NetConn_ClientParsePacket_ServerList_UpdateCache(n);
+
+ return true;
+ }
if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13))
{
serverlist_info_t *info;
info->mod[0] = 0;
info->map[0] = 0;
info->name[0] = 0;
+ info->qcstatus[0] = 0;
+ info->players[0] = 0;
info->protocol = -1;
info->numplayers = 0;
info->numbots = -1;
info->maxplayers = 0;
info->gameversion = 0;
+
if ((s = SearchInfostring(string, "gamename" )) != NULL) strlcpy(info->game, s, sizeof (info->game));
if ((s = SearchInfostring(string, "modname" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));
if ((s = SearchInfostring(string, "mapname" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));
if ((s = SearchInfostring(string, "bots" )) != NULL) info->numbots = atoi(s);
if ((s = SearchInfostring(string, "sv_maxclients")) != NULL) info->maxplayers = atoi(s);
if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);
+ if ((s = SearchInfostring(string, "qcstatus" )) != NULL) strlcpy(info->qcstatus, s, sizeof(info->qcstatus));
info->numhumans = info->numplayers - max(0, info->numbots);
info->freeslots = info->maxplayers - info->numplayers;
if (serverlist_consoleoutput && developer_networking.integer)
Con_Printf("Requesting info from DarkPlaces server %s\n", ipstring);
- if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_DARKPLACES7, ipstring ) ) {
+ if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_DARKPLACES7, ipstring, false ) ) {
break;
}
if (serverlist_consoleoutput && developer_networking.integer)
Con_Printf("Requesting info from QuakeWorld server %s\n", ipstring);
- if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_QUAKEWORLD, ipstring ) ) {
+ if( !NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_QUAKEWORLD, ipstring, false ) ) {
break;
}
return true;
info = &serverlist_cache[n].info;
- strlcpy(info->game, "QuakeWorld", sizeof(info->game));;
+ strlcpy(info->game, "QuakeWorld", sizeof(info->game));
if ((s = SearchInfostring(string, "*gamedir" )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));else info->mod[0] = 0;
if ((s = SearchInfostring(string, "map" )) != NULL) strlcpy(info->map , s, sizeof (info->map ));else info->map[0] = 0;
if ((s = SearchInfostring(string, "hostname" )) != NULL) strlcpy(info->name, s, sizeof (info->name));else info->name[0] = 0;
info->protocol = 0;
info->numplayers = 0; // updated below
+ info->numhumans = 0; // updated below
if ((s = SearchInfostring(string, "maxclients" )) != NULL) info->maxplayers = atoi(s);else info->maxplayers = 0;
if ((s = SearchInfostring(string, "gameversion" )) != NULL) info->gameversion = atoi(s);else info->gameversion = 0;
if (s >= string + length)
break;
info->numplayers++;
+ info->numhumans++;
s++;
}
}
double timeouttime;
static double querycounter = 0;
+ if(!net_slist_pause.integer && serverlist_paused)
+ ServerList_RebuildViewList();
+ serverlist_paused = net_slist_pause.integer;
+
if (serverlist_querysleep)
return;
else
{
for (socket = 0; socket < cl_numsockets ; socket++)
- NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getinfo", &address);
+ NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getstatus", &address);
}
// update the entry fields
if( entry->query == SQS_REFRESHING ) {
// yes, so update the reply count (since its not responding anymore)
serverreplycount--;
- ServerList_ViewList_Remove(entry);
+ if(!serverlist_paused)
+ ServerList_ViewList_Remove(entry);
}
entry->query = SQS_TIMEDOUT;
}
buffer[i] = 0;
}
+// (div0) build the full response only if possible; better a getinfo response than no response at all if getstatus won't fit
static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg, size_t out_size, qboolean fullstatus)
{
+ const char *qcstatus = NULL;
unsigned int nb_clients = 0, nb_bots = 0, i;
int length;
+ SV_VM_Begin();
+
// How many clients are there?
for (i = 0;i < (unsigned int)svs.maxclients;i++)
{
}
}
+ if(prog->globaloffsets.worldstatus >= 0)
+ {
+ const char *str = PRVM_G_STRING(prog->globaloffsets.worldstatus);
+ if(str && *str)
+ {
+ char *p;
+ const char *q;
+ qcstatus = p = Mem_Alloc(tempmempool, strlen(str) + 1);
+ for(q = str; *q; ++q)
+ if(*q != '\\')
+ *p++ = *q;
+ *p = 0;
+ }
+ }
+
// TODO: we should add more information for the full status string
length = dpsnprintf(out_msg, out_size,
"\377\377\377\377%s\x0A"
"\\gamename\\%s\\modname\\%s\\gameversion\\%d\\sv_maxclients\\%d"
"\\clients\\%d\\bots\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d"
"%s%s"
+ "%s%s"
"%s",
fullstatus ? "statusResponse" : "infoResponse",
gamename, com_modname, gameversion.integer, svs.maxclients,
nb_clients, nb_bots, sv.name, hostname.string, NET_PROTOCOL_VERSION,
+ qcstatus ? "\\qcstatus\\" : "", qcstatus ? qcstatus : "",
challenge ? "\\challenge\\" : "", challenge ? challenge : "",
fullstatus ? "\n" : "");
+ if(qcstatus)
+ {
+ Mem_Free((char *)qcstatus);
+ qcstatus = NULL;
+ }
+
// Make sure it fits in the buffer
if (length < 0)
- return false;
+ goto bad;
if (fullstatus)
{
char *ptr;
int left;
+ int savelength;
+
+ savelength = length;
ptr = out_msg + length;
left = (int)out_size - length;
pingvalue = bound(1, pingvalue, 9999);
else
pingvalue = 0;
- length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
- cl->frags,
- pingvalue,
- cleanname);
+
+ if(prog->fieldoffsets.clientstatus >= 0)
+ {
+ const char *str = PRVM_E_STRING(PRVM_EDICT_NUM(i + 1), prog->fieldoffsets.clientstatus);
+ if(str && *str)
+ {
+ char *p;
+ const char *q;
+ qcstatus = p = Mem_Alloc(tempmempool, strlen(str) + 1);
+ for(q = str; *q; ++q)
+ if(*q != '\\' && *q != ' ')
+ *p++ = *q;
+ *p = 0;
+ }
+ }
+
+ if(qcstatus)
+ {
+ length = dpsnprintf(ptr, left, "%s %d \"%s\"\n",
+ qcstatus,
+ pingvalue,
+ cleanname);
+ Mem_Free((char *)qcstatus);
+ qcstatus = NULL;
+ }
+ else
+ length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
+ cl->frags,
+ pingvalue,
+ cleanname);
+
if(length < 0)
- return false;
+ {
+ // out of space?
+ // turn it into an infoResponse!
+ out_msg[savelength] = 0;
+ memcpy(out_msg + 4, "infoResponse\x0A", 13);
+ memmove(out_msg + 17, out_msg + 19, savelength - 19);
+ break;
+ }
left -= length;
ptr += length;
}
}
}
+ SV_VM_End();
return true;
+
+bad:
+ SV_VM_End();
+ return false;
}
static qboolean NetConn_PreventConnectFlood(lhnetaddress_t *peeraddress)
}
}
+// returns a string describing the user level, or NULL for auth failure
+const char *RCon_Authenticate(const char *password, const char *s, const char *endpos)
+{
+ const char *text;
+ qboolean hasquotes;
+
+ if(!strcmp(rcon_password.string, password))
+ return "rcon";
+
+ if(strcmp(rcon_restricted_password.string, password))
+ return NULL;
+
+ for(text = s; text != endpos; ++text)
+ if(*text > 0 && (*text < ' ' || *text == ';'))
+ return NULL; // block possible exploits against the parser/alias expansion
+
+ while(s != endpos)
+ {
+ size_t l = strlen(s);
+ if(l)
+ {
+ hasquotes = (strchr(s, '"') != NULL);
+ // sorry, we can't allow these substrings in wildcard expressions,
+ // as they can mess with the argument counts
+ text = rcon_restricted_commands.string;
+ while(COM_ParseToken_Console(&text))
+ {
+ // com_token now contains a pattern to check for...
+ if(strchr(com_token, '*') || strchr(com_token, '?')) // wildcard expression, * can only match a SINGLE argument
+ {
+ if(!hasquotes)
+ if(matchpattern_with_separator(s, com_token, true, " ", true)) // note how we excluded tab, newline etc. above
+ goto match;
+ }
+ else if(strchr(com_token, ' ')) // multi-arg expression? must match in whole
+ {
+ if(!strcmp(com_token, s))
+ goto match;
+ }
+ else // single-arg expression? must match the beginning of the command
+ {
+ if(!strcmp(com_token, s))
+ goto match;
+ if(!memcmp(va("%s ", com_token), s, strlen(com_token) + 1))
+ goto match;
+ }
+ }
+ // if we got here, nothing matched!
+ return NULL;
+ }
+match:
+ s += l + 1;
+ }
+
+ return "restricted rcon";
+}
+
extern void SV_SendServerinfo (client_t *client);
static int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
{
if(*s <= ' ' && s != endpos) // skip leading ugly space
++s;
password[i] = 0;
- if (password[0] > ' ' && !strcmp(rcon_password.string, password))
+ if (password[0] > ' ')
{
- // looks like a legitimate rcon command with the correct password
- char *s_ptr = s;
- Con_Printf("server received rcon command from %s:\n", host_client ? host_client->name : addressstring2);
- while(s_ptr != endpos)
- {
- size_t l = strlen(s_ptr);
- if(l)
- Con_Printf(" %s;", s_ptr);
- s_ptr += l + 1;
- }
- Con_Printf("\n");
- rcon_redirect = true;
- rcon_redirect_bufferpos = 0;
- while(s != endpos)
- {
- size_t l = strlen(s);
- if(l)
- Cmd_ExecuteString(s, src_command);
- s += l + 1;
- }
- rcon_redirect_buffer[rcon_redirect_bufferpos] = 0;
- rcon_redirect = false;
- // print resulting text to client
- // if client is playing, send a reliable reply instead of
- // a command packet
- if (host_client)
+ const char *userlevel = RCon_Authenticate(password, s, endpos);
+ if(userlevel)
{
- // if the netconnection is loop, then this is the
- // local player on a listen mode server, and it would
- // result in duplicate printing to the console
- // (not that the local player should be using rcon
- // when they have the console)
- if (host_client->netconnection && LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP)
- SV_ClientPrintf("%s", rcon_redirect_buffer);
+ // looks like a legitimate rcon command with the correct password
+ char *s_ptr = s;
+ Con_Printf("server received %s command from %s: ", userlevel, host_client ? host_client->name : addressstring2);
+ while(s_ptr != endpos)
+ {
+ size_t l = strlen(s_ptr);
+ if(l)
+ Con_Printf(" %s;", s_ptr);
+ s_ptr += l + 1;
+ }
+ Con_Printf("\n");
+
+ if (!host_client || !host_client->netconnection || LHNETADDRESS_GetAddressType(&host_client->netconnection->peeraddress) != LHNETADDRESSTYPE_LOOP)
+ Con_Rcon_Redirect_Init(mysocket, peeraddress);
+ while(s != endpos)
+ {
+ size_t l = strlen(s);
+ if(l)
+ {
+ client_t *host_client_save = host_client;
+ Cmd_ExecuteString(s, src_command);
+ host_client = host_client_save;
+ // in case it is a command that changes host_client (like restart)
+ }
+ s += l + 1;
+ }
+ Con_Rcon_Redirect_End();
}
else
{
- // qw print command
- dpsnprintf(response, sizeof(response), "\377\377\377\377n%s", rcon_redirect_buffer);
- NetConn_WriteString(mysocket, response, peeraddress);
+ Con_Printf("server denied rcon access to %s\n", host_client ? host_client->name : addressstring2);
}
}
return true;
int masternum;
lhnetaddress_t masteraddress;
lhnetaddress_t broadcastaddress;
+ lhnetaddress_t serveraddress;
+ const char *text;
char request[256];
if (serverlist_cachecount >= SERVERLIST_TOTALSIZE)
{
if (cl_sockets[i])
{
- // search LAN for Quake servers
- SZ_Clear(&net_message);
- // save space for the header, filled in later
- MSG_WriteLong(&net_message, 0);
- MSG_WriteByte(&net_message, CCREQ_SERVER_INFO);
- MSG_WriteString(&net_message, "QUAKE");
- MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION);
- *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
- NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress);
- SZ_Clear(&net_message);
+ int af = LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]));
+
+ if(LHNETADDRESS_GetAddressType(&broadcastaddress) == af)
+ {
+ // search LAN for Quake servers
+ SZ_Clear(&net_message);
+ // save space for the header, filled in later
+ MSG_WriteLong(&net_message, 0);
+ MSG_WriteByte(&net_message, CCREQ_SERVER_INFO);
+ MSG_WriteString(&net_message, "QUAKE");
+ MSG_WriteByte(&net_message, NET_PROTOCOL_VERSION);
+ *((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
+ NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress);
+ SZ_Clear(&net_message);
- // search LAN for DarkPlaces servers
- NetConn_WriteString(cl_sockets[i], "\377\377\377\377getinfo", &broadcastaddress);
+ // search LAN for DarkPlaces servers
+ NetConn_WriteString(cl_sockets[i], "\377\377\377\377getstatus", &broadcastaddress);
+ }
// build the getservers message to send to the dpmaster master servers
dpsnprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION);
// search internet
for (masternum = 0;sv_masters[masternum].name;masternum++)
{
- if (sv_masters[masternum].string && sv_masters[masternum].string[0] && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i])))
+ if (sv_masters[masternum].string && sv_masters[masternum].string[0] && LHNETADDRESS_FromString(&masteraddress, sv_masters[masternum].string, DPMASTER_PORT) && LHNETADDRESS_GetAddressType(&masteraddress) == af)
{
masterquerycount++;
NetConn_WriteString(cl_sockets[i], request, &masteraddress);
}
}
+
+ // search favorite servers
+ text = net_slist_favorites.string;
+ while(COM_ParseToken_Console(&text))
+ {
+ if(LHNETADDRESS_FromString(&serveraddress, com_token, 26000) && LHNETADDRESS_GetAddressType(&masteraddress) == af)
+ {
+ NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_DARKPLACES7, com_token, true );
+ }
+ }
}
}
}
{
if (cl_sockets[i])
{
- // search LAN for QuakeWorld servers
- NetConn_WriteString(cl_sockets[i], "\377\377\377\377status\n", &broadcastaddress);
+ int af = LHNETADDRESS_GetAddressType(LHNET_AddressFromSocket(cl_sockets[i]));
- // build the getservers message to send to the qwmaster master servers
- // note this has no -1 prefix, and the trailing nul byte is sent
- dpsnprintf(request, sizeof(request), "c\n");
+ if(LHNETADDRESS_GetAddressType(&broadcastaddress) == af)
+ {
+ // search LAN for QuakeWorld servers
+ NetConn_WriteString(cl_sockets[i], "\377\377\377\377status\n", &broadcastaddress);
+
+ // build the getservers message to send to the qwmaster master servers
+ // note this has no -1 prefix, and the trailing nul byte is sent
+ dpsnprintf(request, sizeof(request), "c\n");
+ }
// search internet
for (masternum = 0;sv_qwmasters[masternum].name;masternum++)
NetConn_Write(cl_sockets[i], request, (int)strlen(request) + 1, &masteraddress);
}
}
+
+ // search favorite servers
+ text = net_slist_favorites.string;
+ while(COM_ParseToken_Console(&text))
+ {
+ if(LHNETADDRESS_FromString(&serveraddress, com_token, 26000) && LHNETADDRESS_GetAddressType(&masteraddress) == af)
+ {
+ // writing AND querying to catch replies for both
+ // protocols (in case DP has been queried above, this
+ // would only try the DP protocol otherwise)
+ NetConn_WriteString(cl_sockets[i], "\377\377\377\377status\n", &serveraddress);
+ NetConn_ClientParsePacket_ServerList_PrepareQuery( PROTOCOL_QUAKEWORLD, com_token, true );
+ }
+ }
}
}
}
void PrintStats(netconn_t *conn)
{
if ((cls.state == ca_connected && cls.protocol == PROTOCOL_QUAKEWORLD) || (sv.active && sv.protocol == PROTOCOL_QUAKEWORLD))
- Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->qw.outgoing_sequence, conn->qw.incoming_sequence);
+ Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->outgoing_unreliable_sequence, conn->qw.incoming_sequence);
else
Con_Printf("address=%21s canSend=%u sendSeq=%6u recvSeq=%6u\n", conn->address, !conn->sendMessageLength, conn->nq.sendSequence, conn->nq.receiveSequence);
}
{
ServerList_ResetMasks();
serverlist_sortbyfield = SLIF_PING;
- serverlist_sortdescending = false;
+ serverlist_sortflags = 0;
if (m_state != m_slist) {
Con_Print("Sending requests to master servers\n");
ServerList_QueryList(true, true, false, true);
{
ServerList_ResetMasks();
serverlist_sortbyfield = SLIF_PING;
- serverlist_sortdescending = false;
+ serverlist_sortflags = 0;
if (m_state != m_slist) {
Con_Print("Sending requests to master servers\n");
ServerList_QueryList(true, false, true, true);
Cmd_AddCommand("net_slistqw", Net_SlistQW_f, "query qw master servers and print all server information");
Cmd_AddCommand("net_refresh", Net_Refresh_f, "query dp master servers and refresh all server information");
Cmd_AddCommand("heartbeat", Net_Heartbeat_f, "send a heartbeat to the master server (updates your server information)");
+ Cvar_RegisterVariable(&rcon_restricted_password);
+ Cvar_RegisterVariable(&rcon_restricted_commands);
Cvar_RegisterVariable(&net_slist_queriespersecond);
Cvar_RegisterVariable(&net_slist_queriesperframe);
Cvar_RegisterVariable(&net_slist_timeout);
Cvar_RegisterVariable(&net_slist_maxtries);
+ Cvar_RegisterVariable(&net_slist_favorites);
+ Cvar_RegisterVariable(&net_slist_pause);
Cvar_RegisterVariable(&net_messagetimeout);
Cvar_RegisterVariable(&net_connecttimeout);
Cvar_RegisterVariable(&net_connectfloodblockingtimeout);
projects / xonotic / darkplaces.git / blobdiff