#define MASTER_PORT 27950
-cvar_t sv_public = {0, "sv_public", "0"};
+cvar_t sv_public = {0, "sv_public", "1"};
static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"};
// FIXME: resolve DNS on masters whenever their value changes and cache it (to avoid major delays in active servers when they heartbeat)
{CVAR_SAVE, "sv_master4", ""},
{0, "sv_masterextra1", "69.59.212.88"}, // ghdigital.com
{0, "sv_masterextra2", "66.169.205.13"}, // dpmaster.deathmask.net
+ {0, "sv_masterextra3", "12.166.196.192"}, // blaze.mindphukd.org
{0, NULL, NULL}
};
//cvar_t net_netaddress_ipv6 = {0, "net_address_ipv6", "[0:0:0:0:0:0:0:0]"};
// HostCache interface
-hostcache_mask_t hostcache_currentmask;
+hostcache_mask_t hostcache_andmasks[HOSTCACHE_ANDMASKCOUNT];
+hostcache_mask_t hostcache_ormasks[HOSTCACHE_ORMASKCOUNT];
+
hostcache_infofield_t hostcache_sortbyfield;
qboolean hostcache_sortdescending;
// returns true if A should be inserted before B
static qboolean _HostCache_SortTest( hostcache_t *A, hostcache_t *B )
{
- int result; // > 0 if for numbers A > B and for text if A < B
+ int result = 0; // > 0 if for numbers A > B and for text if A < B
if( hostcache_sortbyfield == HCIF_PING )
result = A->info.ping - B->info.ping;
result = strcmp( B->info.mod, A->info.mod );
else if( hostcache_sortbyfield == HCIF_NAME )
result = strcmp( B->info.name, A->info.name );
-
- if( result > 0 && hostcache_sortdescending)
- return true;
- return false;
+
+ if( hostcache_sortdescending )
+ return result > 0;
+ return result < 0;
}
-static qboolean _hc_testint( int A, hostcache_infofield_t op, int B )
+static qboolean _hc_testint( int A, hostcache_maskop_t op, int B )
{
- int diff;
-
- diff = A - B;
- switch( op ) {
- case HCMO_GREATER:
- if( !diff )
- return false;
- case HCMO_GREATEREQUAL:
- if( diff < 0 )
- return false;
- break;
- case HCMO_EQUAL:
- if( diff )
- return false;
- break;
- case HCMO_LESS:
- if( !diff )
- return false;
- case HCMO_LESSEQUAL:
- if( diff > 0 )
- return false;
- break;
- }
- return true;
+ if( op == HCMO_LESS )
+ return A < B;
+ else if( op == HCMO_LESSEQUAL )
+ return A <= B;
+ else if( op == HCMO_EQUAL )
+ return A == B;
+ else if( op == HCMO_GREATER )
+ return A > B;
+ else if( op == HCMO_NOTEQUAL )
+ return A != B;
+ else // HCMO_GREATEREQUAL
+ return A >= B;
}
-static qboolean _HostCache_TestMask( hostcache_info_t *info )
+static qboolean _hc_teststr( const char *A, hostcache_maskop_t op, const char *B )
{
- if( !_hc_testint( info->ping, hostcache_currentmask.pingtest, hostcache_currentmask.info.ping ) )
+ if( op == HCMO_CONTAINS ) // A info B mask
+ return *B && !!strstr( A, B ); // we want a real bool
+ else if( op == HCMO_NOTCONTAIN )
+ return !*B || !strstr( A, B );
+ else if( op == HCMO_LESS )
+ return strcmp( A, B ) < 0;
+ else if( op == HCMO_LESSEQUAL )
+ return strcmp( A, B ) <= 0;
+ else if( op == HCMO_EQUAL )
+ return strcmp( A, B ) == 0;
+ else if( op == HCMO_GREATER )
+ return strcmp( A, B ) > 0;
+ else if( op == HCMO_NOTEQUAL )
+ return strcmp( A, B ) != 0;
+ else // HCMO_GREATEREQUAL
+ return strcmp( A, B ) >= 0;
+}
+
+static qboolean _HostCache_TestMask( hostcache_mask_t *mask, hostcache_info_t *info )
+{
+ if( !_hc_testint( info->ping, mask->tests[HCIF_PING], mask->info.ping ) )
return false;
- if( !_hc_testint( info->maxplayers, hostcache_currentmask.maxplayerstest, hostcache_currentmask.info.maxplayers ) )
+ if( !_hc_testint( info->maxplayers, mask->tests[HCIF_MAXPLAYERS], mask->info.maxplayers ) )
return false;
- if( !_hc_testint( info->numplayers, hostcache_currentmask.numplayerstest, hostcache_currentmask.info.numplayers ) )
+ if( !_hc_testint( info->numplayers, mask->tests[HCIF_NUMPLAYERS], mask->info.numplayers ) )
return false;
- if( !_hc_testint( info->protocol, hostcache_currentmask.protocoltest, hostcache_currentmask.info.protocol ))
+ if( !_hc_testint( info->protocol, mask->tests[HCIF_PROTOCOL], mask->info.protocol ))
return false;
- if( *hostcache_currentmask.info.cname
- && !strstr( info->cname, hostcache_currentmask.info.cname ) )
+ if( *mask->info.cname
+ && !_hc_teststr( info->cname, mask->tests[HCIF_CNAME], mask->info.cname ) )
return false;
- if( *hostcache_currentmask.info.game
- && !strstr( info->game, hostcache_currentmask.info.game ) )
+ if( *mask->info.game
+ && !_hc_teststr( info->game, mask->tests[HCIF_GAME], mask->info.game ) )
return false;
- if( *hostcache_currentmask.info.mod
- && !strstr( info->mod, hostcache_currentmask.info.mod ) )
+ if( *mask->info.mod
+ && !_hc_teststr( info->mod, mask->tests[HCIF_MOD], mask->info.mod ) )
return false;
- if( *hostcache_currentmask.info.map
- && !strstr( info->map, hostcache_currentmask.info.map ) )
+ if( *mask->info.map
+ && !_hc_teststr( info->map, mask->tests[HCIF_MAP], mask->info.map ) )
return false;
- if( *hostcache_currentmask.info.name
- && !strstr( info->name, hostcache_currentmask.info.name ) )
+ if( *mask->info.name
+ && !_hc_teststr( info->name, mask->tests[HCIF_NAME], mask->info.name ) )
return false;
return true;
}
int start, end, mid;
if( hostcache_viewcount == HOSTCACHE_VIEWCACHESIZE )
return;
- // now check whether it passes through mask
- if( !_HostCache_TestMask( &entry->info ) )
+ // now check whether it passes through the masks mask
+ for( start = 0 ; hostcache_andmasks[start].active && start < HOSTCACHE_ANDMASKCOUNT ; start++ )
+ if( !_HostCache_TestMask( &hostcache_andmasks[start], &entry->info ) )
+ return;
+
+ for( start = 0 ; hostcache_ormasks[start].active && start < HOSTCACHE_ORMASKCOUNT ; start++ )
+ if( _HostCache_TestMask( &hostcache_ormasks[start], &entry->info ) )
+ break;
+ if( start == HOSTCACHE_ORMASKCOUNT || (start > 0 && !hostcache_ormasks[start].active) )
return;
if( !hostcache_viewcount ) {
_HostCache_ViewSet_InsertBefore( hostcache_viewcount, entry );
return;
}
- start = 1;
+ start = 0;
end = hostcache_viewcount - 1;
- while( end > start )
+ while( end > start + 1 )
{
mid = (start + end) / 2;
// test the item that lies in the middle between start and end
if( _HostCache_SortTest( entry, hostcache_viewset[mid] ) )
// the item has to be in the upper half
- end = mid - 1;
- else
+ end = mid;
+ else
// the item has to be in the lower half
- start = mid + 1;
+ start = mid;
}
_HostCache_ViewSet_InsertBefore( start + 1, entry );
}
void HostCache_RebuildViewSet(void)
{
int i;
-
+
hostcache_viewcount = 0;
for( i = 0 ; i < hostcache_cachecount ; i++ )
if( hostcache_cache[i].finished )
_HostCache_Insert( &hostcache_cache[i] );
}
-void HostCache_ResetMask(void)
+void HostCache_ResetMasks(void)
{
- memset( &hostcache_currentmask, 0, sizeof( hostcache_mask_t ) );
+ memset( &hostcache_andmasks, 0, sizeof( hostcache_andmasks ) );
+ memset( &hostcache_ormasks, 0, sizeof( hostcache_ormasks ) );
}
+#if 0
+static void _HostCache_Test(void)
+{
+ int i;
+ for( i = 0 ; i < 1024 ; i++ ) {
+ memset( &hostcache_cache[hostcache_cachecount], 0, sizeof( hostcache_t ) );
+ hostcache_cache[hostcache_cachecount].info.ping = rand() % 450 + 250;
+ dpsnprintf( hostcache_cache[hostcache_cachecount].info.name, 128, "Black's HostCache Test %i", i );
+ hostcache_cache[hostcache_cachecount].finished = true;
+ sprintf( hostcache_cache[hostcache_cachecount].line1, "%i %s", hostcache_cache[hostcache_cachecount].info.ping, hostcache_cache[hostcache_cachecount].info.name );
+ _HostCache_Insert( &hostcache_cache[hostcache_cachecount] );
+ hostcache_cachecount++;
+ }
+}
+#endif
void HostCache_QueryList(void)
{
hostcache_viewcount = 0;
hostcache_consoleoutput = false;
NetConn_QueryMasters();
+
+ //_HostCache_Test();
}
// rest
{
int length = LHNET_Read(mysocket, data, maxlength, peeraddress);
int i;
+ if (length == 0)
+ return 0;
if (cl_netpacketloss.integer)
for (i = 0;i < cl_numsockets;i++)
if (cl_sockets[i] == mysocket && (rand() % 100) < cl_netpacketloss.integer)
return 0;
- if (developer_networking.integer && length != 0)
+ if (developer_networking.integer)
{
char addressstring[128], addressstring2[128];
LHNETADDRESS_ToString(LHNET_AddressFromSocket(mysocket), addressstring, sizeof(addressstring), true);
cls.state = ca_connected;
cls.signon = 0; // need all the signon messages before playing
CL_ClearState();
- SCR_BeginLoadingPlaque();
}
int NetConn_IsLocalGame(void)
hostcache_info_t *info;
int i, n;
double pingtime;
-
+
string += 13;
// hostcache only uses text addresses
LHNETADDRESS_ToString(peeraddress, cname, sizeof(cname), true);
// legacy/old stuff move it to the menu ASAP
// build description strings for the things users care about
- snprintf(hostcache_cache[n].line1, sizeof(hostcache_cache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name);
- snprintf(hostcache_cache[n].line2, sizeof(hostcache_cache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map);
+ dpsnprintf(hostcache_cache[n].line1, sizeof(hostcache_cache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name);
+ dpsnprintf(hostcache_cache[n].line2, sizeof(hostcache_cache[n].line2), "%-21.21s %-19.19s %-17.17s %-20.20s", info->cname, info->game, info->mod, info->map);
// if ping is especially high, display it as such
if (pingtime >= 300)
{
if (hostcache_cache[n].line1[i] != ' ')
hostcache_cache[n].line1[i] -= 30;
}
- // if not in the slist menu we should print the server to console
- if( hostcache_consoleoutput )
- Con_Printf("%s\n%s\n", hostcache_cache[n].line1, hostcache_cache[n].line2);
// and finally, update the view set
if( hostcache_cache[n].finished )
_HostCache_Remove( &hostcache_cache[n] );
+ // else if not in the slist menu we should print the server to console (if wanted)
+ else if( hostcache_consoleoutput )
+ Con_Printf("%s\n%s\n", hostcache_cache[n].line1, hostcache_cache[n].line2);
_HostCache_Insert( &hostcache_cache[n] );
hostcache_cache[n].finished = true;
while (length >= 7 && data[0] == '\\' && (data[1] != 0xFF || data[2] != 0xFF || data[3] != 0xFF || data[4] != 0xFF) && data[5] * 256 + data[6] != 0)
{
serverquerycount++;
-
- snprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]);
+
+ dpsnprintf (ipstring, sizeof (ipstring), "%u.%u.%u.%u:%u", data[1], data[2], data[3], data[4], (data[5] << 8) | data[6]);
if (developer.integer)
- Con_Printf("Requesting info from server %s\n", ipstring);
+ Con_Printf("Requesting info from server %s\n", ipstring);
// ignore the rest of the message if the hostcache is full
if( hostcache_cachecount == HOSTCACHE_TOTALSIZE )
break;
for (i = 0, n = 0;i < svs.maxclients;i++)
if (svs.clients[i].active)
n++;
- responselength = snprintf(response, sizeof(response), "\377\377\377\377infoResponse\x0A"
+ responselength = dpsnprintf(response, sizeof(response), "\377\377\377\377infoResponse\x0A"
"\\gamename\\%s\\modname\\%s\\sv_maxclients\\%d"
"\\clients\\%d\\mapname\\%s\\hostname\\%s\\protocol\\%d%s%s",
gamename, com_modname, svs.maxclients, n,
sv.name, hostname.string, NET_PROTOCOL_VERSION, challenge ? "\\challenge\\" : "", challenge ? challenge : "");
// does it fit in the buffer?
- if (responselength < (int)sizeof(response))
+ if (responselength >= 0)
{
if (developer.integer)
Con_Printf("Sending reply to master %s - %s\n", addressstring2, response);
int i;
int masternum;
lhnetaddress_t masteraddress;
+ lhnetaddress_t broadcastaddress;
char request[256];
if (hostcache_cachecount >= HOSTCACHE_TOTALSIZE)
return;
+ // 26000 is the default quake server port, servers on other ports will not
+ // be found
+ // note this is IPv4-only, I doubt there are IPv6-only LANs out there
+ LHNETADDRESS_FromString(&broadcastaddress, "255.255.255.255", 26000);
+
for (i = 0;i < cl_numsockets;i++)
{
if (cl_sockets[i])
{
-#if 0
- // search LAN
-#if 1
- UDP_Broadcast(UDP_controlSock, "\377\377\377\377getinfo", 11);
-#else
+ // search LAN for Quake servers
SZ_Clear(&net_message);
// save space for the header, filled in later
MSG_WriteLong(&net_message, 0);
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));
- UDP_Broadcast(UDP_controlSock, net_message.data, net_message.cursize);
+ NetConn_Write(cl_sockets[i], net_message.data, net_message.cursize, &broadcastaddress);
SZ_Clear(&net_message);
-#endif
-#endif
- // build the getservers
- snprintf(request, sizeof(request), "\377\377\377\377getservers %s %u empty full\x0A", gamename, NET_PROTOCOL_VERSION);
+ // search LAN for DarkPlaces servers
+ NetConn_WriteString(cl_sockets[i], "\377\377\377\377getinfo", &broadcastaddress);
+
+ // build the getservers message to send to the 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++)
void Net_Slist_f(void)
{
- HostCache_ResetMask();
+ HostCache_ResetMasks();
hostcache_sortbyfield = HCIF_PING;
hostcache_sortdescending = false;
if (m_state != m_slist) {
projects / xonotic / darkplaces.git / blobdiff