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"};
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;
case SLIF_QCSTATUS:
result = strcasecmp( B->info.qcstatus, A->info.qcstatus ); // not really THAT useful, though
break;
- case SLIF_PLAYERS:
- result = strcasecmp( B->info.players, A->info.qcstatus ); // not really THAT useful, though
+ 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)
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 ; start < SERVERLIST_ANDMASKCOUNT && serverlist_andmasks[start].active; start++ )
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);
}
// 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;
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;
fullstatus ? "\n" : "");
if(qcstatus)
+ {
Mem_Free((char *)qcstatus);
+ qcstatus = NULL;
+ }
// Make sure it fits in the buffer
if (length < 0)
pingvalue,
cleanname);
Mem_Free((char *)qcstatus);
+ qcstatus = NULL;
}
else
length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
s_ptr += l + 1;
}
Con_Printf("\n");
- rcon_redirect = true;
- rcon_redirect_bufferpos = 0;
+
+ 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);
}
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)
- {
- // 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);
- }
- else
- {
- // qw print command
- dpsnprintf(response, sizeof(response), "\377\377\377\377n%s", rcon_redirect_buffer);
- NetConn_WriteString(mysocket, response, peeraddress);
- }
+ Con_Rcon_Redirect_End();
}
else
{
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\377getstatus", &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]));
+
+ 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");
+ // 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 );
+ }
+ }
}
}
}
{
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);
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);
projects / xonotic / darkplaces.git / blobdiff