X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=1ce0b0c8c516ad1b2bea3152af815bb734d92934;hp=22a4f13016e6cd2907ff3969a3c4a724cc51da4a;hb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;hpb=8ea8ee92cdbbeb593e424ae3985ac8de766bafa4

diff --git a/netconn.c b/netconn.c
index 22a4f130..1ce0b0c8 100755
--- a/netconn.c
+++ b/netconn.c
@@ -25,8 +25,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #define MASTER_PORT 27950
 
+// note this defaults on for dedicated servers, off for listen servers
 cvar_t sv_public = {0, "sv_public", "0"};
-static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "180"};
+static cvar_t sv_heartbeatperiod = {CVAR_SAVE, "sv_heartbeatperiod", "120"};
 
 // FIXME: resolve DNS on masters whenever their value changes and cache it (to avoid major delays in active servers when they heartbeat)
 static cvar_t sv_masters [] =
@@ -35,14 +36,16 @@ static cvar_t sv_masters [] =
 	{CVAR_SAVE, "sv_master2", ""},
 	{CVAR_SAVE, "sv_master3", ""},
 	{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_masterextra1", "ghdigital.com"}, //69.59.212.88
+	{0, "sv_masterextra2", "dpmaster.deathmask.net"}, //66.169.205.20
+	{0, "sv_masterextra3", "12.166.196.192"}, //blaze.mindphukd.org (doesn't resolve currently but works as an ip)
 	{0, NULL, NULL}
 };
 
 static double nextheartbeattime = 0;
 
 sizebuf_t net_message;
+static unsigned char net_message_buf[NET_MAXMESSAGE];
 
 cvar_t net_messagetimeout = {0, "net_messagetimeout","300"};
 cvar_t net_messagerejointimeout = {0, "net_messagerejointimeout","10"};
@@ -52,7 +55,10 @@ cvar_t developer_networking = {0, "developer_networking", "0"};
 
 cvar_t cl_netlocalping = {0, "cl_netlocalping","0"};
 static cvar_t cl_netpacketloss = {0, "cl_netpacketloss","0"};
-
+static cvar_t net_slist_queriespersecond = {0, "net_slist_queriespersecond", "20"};
+static cvar_t net_slist_queriesperframe = {0, "net_slist_queriesperframe", "4"};
+static cvar_t net_slist_timeout = {0, "net_slist_timeout", "4"};
+static cvar_t net_slist_maxtries = {0, "net_slist_maxtries", "3"};
 
 /* statistic counters */
 static int packetsSent = 0;
@@ -72,8 +78,11 @@ int masterreplycount = 0;
 int serverquerycount = 0;
 int serverreplycount = 0;
 
-static qbyte sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
-static qbyte readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
+// this is only false if there are still servers left to query
+int serverlist_querysleep = true;
+
+static unsigned char sendbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
+static unsigned char readbuffer[NET_HEADERSIZE+NET_MAXMESSAGE];
 
 int cl_numsockets;
 lhnetsocket_t *cl_sockets[16];
@@ -88,220 +97,285 @@ cvar_t sv_netport = {0, "port", "26000"};
 cvar_t net_address = {0, "net_address", "0.0.0.0"};
 //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_infofield_t	hostcache_sortbyfield;
-qboolean				hostcache_sortdescending;
+// ServerList interface
+serverlist_mask_t serverlist_andmasks[SERVERLIST_ANDMASKCOUNT];
+serverlist_mask_t serverlist_ormasks[SERVERLIST_ORMASKCOUNT];
 
-int			hostcache_viewcount = 0;
-hostcache_t	*hostcache_viewset[HOSTCACHE_VIEWCACHESIZE];
+serverlist_infofield_t serverlist_sortbyfield;
+qboolean serverlist_sortdescending;
 
-int			hostcache_cachecount;
-hostcache_t hostcache_cache[HOSTCACHE_TOTALSIZE];
+int serverlist_viewcount = 0;
+serverlist_entry_t *serverlist_viewlist[SERVERLIST_VIEWLISTSIZE];
 
-qboolean	hostcache_consoleoutput;
+int serverlist_cachecount;
+serverlist_entry_t serverlist_cache[SERVERLIST_TOTALSIZE];
+
+qboolean serverlist_consoleoutput;
 
 // helper function to insert a value into the viewset
 // spare entries will be removed
-static void _HostCache_ViewSet_InsertBefore( int index, hostcache_t *entry )
+static void _ServerList_ViewList_Helper_InsertBefore( int index, serverlist_entry_t *entry )
 {
     int i;
-	if( ++hostcache_viewcount > HOSTCACHE_VIEWCACHESIZE )
-		hostcache_viewcount = HOSTCACHE_VIEWCACHESIZE;
-	for( i = hostcache_viewcount - 1; i > index; i-- )
-		hostcache_viewset[i] = hostcache_viewset[i - 1];
-	hostcache_viewset[index] = entry;
+	if( serverlist_viewcount < SERVERLIST_VIEWLISTSIZE ) {
+		i = serverlist_viewcount++;
+	} else {
+		i = SERVERLIST_VIEWLISTSIZE - 1;
+	}
+
+	for( ; i > index ; i-- )
+		serverlist_viewlist[ i ] = serverlist_viewlist[ i - 1 ];
+
+	serverlist_viewlist[index] = entry;
 }
 
-// we suppose hostcache_viewcount to be valid, ie > 0
-static void _HostCache_ViewSet_Remove( int index )
+// we suppose serverlist_viewcount to be valid, ie > 0
+static void _ServerList_ViewList_Helper_Remove( int index )
 {
-	for( --hostcache_viewcount; index < hostcache_viewcount; index++ )
-		hostcache_viewset[index] = hostcache_viewset[index + 1];
+	serverlist_viewcount--;
+	for( ; index < serverlist_viewcount ; index++ )
+		serverlist_viewlist[index] = serverlist_viewlist[index + 1];
 }
 
 // returns true if A should be inserted before B
-static qboolean _HostCache_SortTest( hostcache_t *A, hostcache_t *B )
+static qboolean _ServerList_Entry_Compare( serverlist_entry_t *A, serverlist_entry_t *B )
 {
-	int result; // > 0 if for numbers A > B and for text if A < B 
-
-	if( hostcache_sortbyfield == HCIF_PING )
-		result = A->info.ping - B->info.ping;
-	else if( hostcache_sortbyfield == HCIF_MAXPLAYERS )
-		result = A->info.maxplayers - B->info.maxplayers;
-	else if( hostcache_sortbyfield == HCIF_NUMPLAYERS )
-		result = A->info.numplayers - B->info.numplayers;
-	else if( hostcache_sortbyfield == HCIF_PROTOCOL )
-		result = A->info.protocol - B->info.protocol;
-	else if( hostcache_sortbyfield == HCIF_CNAME )
-		result = strcmp( B->info.cname, A->info.cname );
-	else if( hostcache_sortbyfield == HCIF_GAME )
-		result = strcmp( B->info.game, A->info.game );
-	else if( hostcache_sortbyfield == HCIF_MAP )
-		result = strcmp( B->info.map, A->info.map );
-	else if( hostcache_sortbyfield == HCIF_MOD )
-		result = strcmp( B->info.mod, A->info.mod );
-	else if( hostcache_sortbyfield == HCIF_NAME )
-		result = strcmp( B->info.name, A->info.name );
-	
-	if( hostcache_sortdescending )
+	int result = 0; // > 0 if for numbers A > B and for text if A < B
+
+	switch( serverlist_sortbyfield ) {
+		case SLIF_PING:
+			result = A->info.ping - B->info.ping;
+			break;
+		case SLIF_MAXPLAYERS:
+			result = A->info.maxplayers - B->info.maxplayers;
+			break;
+		case SLIF_NUMPLAYERS:
+			result = A->info.numplayers - B->info.numplayers;
+			break;
+		case SLIF_PROTOCOL:
+			result = A->info.protocol - B->info.protocol;
+			break;
+		case SLIF_CNAME:
+			result = strcmp( B->info.cname, A->info.cname );
+			break;
+		case SLIF_GAME:
+			result = strcmp( B->info.game, A->info.game );
+			break;
+		case SLIF_MAP:
+			result = strcmp( B->info.map, A->info.map );
+			break;
+		case SLIF_MOD:
+			result = strcmp( B->info.mod, A->info.mod );
+			break;
+		case SLIF_NAME:
+			result = strcmp( B->info.name, A->info.name );
+			break;
+		default:
+			Con_DPrint( "_ServerList_Entry_Compare: Bad serverlist_sortbyfield!\n" );
+			break;
+	}
+
+	if( serverlist_sortdescending )
 		return result > 0;
 	return result < 0;
 }
 
-static qboolean _hc_testint( int A, hostcache_maskop_t op, int B )
+static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int B )
 {
-	int diff;
+	// This should actually be done with some intermediate and end-of-function return
+	switch( op ) {
+		case SLMO_LESS:
+			return A < B;
+		case SLMO_LESSEQUAL:
+			return A <= B;
+		case SLMO_EQUAL:
+			return A == B;
+		case SLMO_GREATER:
+			return A > B;
+		case SLMO_NOTEQUAL:
+			return A != B;
+		case SLMO_GREATEREQUAL:
+		case SLMO_CONTAINS:
+		case SLMO_NOTCONTAIN:
+			return A >= B;
+		default:
+			Con_DPrint( "_ServerList_CompareInt: Bad op!\n" );
+			return false;
+	}
+}
 
-	diff = A - B;
+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];
+	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];
+	bufferB[i] = 0;
+
+	// Same here, also using an intermediate & final return would be more appropriate
+	// A info B mask
 	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;
+		case SLMO_CONTAINS:
+			return *bufferB && !!strstr( bufferA, bufferB ); // we want a real bool
+		case SLMO_NOTCONTAIN:
+			return !*bufferB || !strstr( bufferA, bufferB );
+		case SLMO_LESS:
+			return strcmp( bufferA, bufferB ) < 0;
+		case SLMO_LESSEQUAL:
+			return strcmp( bufferA, bufferB ) <= 0;
+		case SLMO_EQUAL:
+			return strcmp( bufferA, bufferB ) == 0;
+		case SLMO_GREATER:
+			return strcmp( bufferA, bufferB ) > 0;
+		case SLMO_NOTEQUAL:
+			return strcmp( bufferA, bufferB ) != 0;
+		case SLMO_GREATEREQUAL:
+			return strcmp( bufferA, bufferB ) >= 0;
+		default:
+			Con_DPrint( "_ServerList_CompareStr: Bad op!\n" );
+			return false;
 	}
-	return true;
 }
 
-static qboolean _HostCache_TestMask( hostcache_info_t *info )
+static qboolean _ServerList_Entry_Mask( serverlist_mask_t *mask, serverlist_info_t *info )
 {
-	if( !_hc_testint( info->ping, hostcache_currentmask.pingtest, hostcache_currentmask.info.ping ) )
+	if( !_ServerList_CompareInt( info->ping, mask->tests[SLIF_PING], mask->info.ping ) )
 		return false;
-	if( !_hc_testint( info->maxplayers, hostcache_currentmask.maxplayerstest, hostcache_currentmask.info.maxplayers ) )
+	if( !_ServerList_CompareInt( info->maxplayers, mask->tests[SLIF_MAXPLAYERS], mask->info.maxplayers ) )
 		return false;
-	if( !_hc_testint( info->numplayers, hostcache_currentmask.numplayerstest, hostcache_currentmask.info.numplayers ) )
+	if( !_ServerList_CompareInt( info->numplayers, mask->tests[SLIF_NUMPLAYERS], mask->info.numplayers ) )
 		return false;
-	if( !_hc_testint( info->protocol, hostcache_currentmask.protocoltest, hostcache_currentmask.info.protocol ))
+	if( !_ServerList_CompareInt( info->protocol, mask->tests[SLIF_PROTOCOL], mask->info.protocol ))
 		return false;
-	if( *hostcache_currentmask.info.cname
-		&& !strstr( info->cname, hostcache_currentmask.info.cname ) )
+	if( *mask->info.cname
+		&& !_ServerList_CompareStr( info->cname, mask->tests[SLIF_CNAME], mask->info.cname ) )
 		return false;
-	if( *hostcache_currentmask.info.game
-		&& !strstr( info->game, hostcache_currentmask.info.game ) )
+	if( *mask->info.game
+		&& !_ServerList_CompareStr( info->game, mask->tests[SLIF_GAME], mask->info.game ) )
 		return false;
-	if( *hostcache_currentmask.info.mod
-		&& !strstr( info->mod, hostcache_currentmask.info.mod ) )
+	if( *mask->info.mod
+		&& !_ServerList_CompareStr( info->mod, mask->tests[SLIF_MOD], mask->info.mod ) )
 		return false;
-	if( *hostcache_currentmask.info.map
-		&& !strstr( info->map, hostcache_currentmask.info.map ) )
+	if( *mask->info.map
+		&& !_ServerList_CompareStr( info->map, mask->tests[SLIF_MAP], mask->info.map ) )
 		return false;
-	if( *hostcache_currentmask.info.name
-		&& !strstr( info->name, hostcache_currentmask.info.name ) )
+	if( *mask->info.name
+		&& !_ServerList_CompareStr( info->name, mask->tests[SLIF_NAME], mask->info.name ) )
 		return false;
 	return true;
 }
 
-static void _HostCache_Insert( hostcache_t *entry )
+static void ServerList_ViewList_Insert( serverlist_entry_t *entry )
 {
 	int start, end, mid;
-	if( hostcache_viewcount == HOSTCACHE_VIEWCACHESIZE )
-		return;
-	// now check whether it passes through mask
-	if( !_HostCache_TestMask( &entry->info ) )
+
+	// 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++ )
+		if( !_ServerList_Entry_Mask( &serverlist_andmasks[start], &entry->info ) )
+			return;
+
+	for( start = 0 ; serverlist_ormasks[start].active && start < SERVERLIST_ORMASKCOUNT ; start++ )
+		if( _ServerList_Entry_Mask( &serverlist_ormasks[start], &entry->info ) )
+			break;
+	if( start == SERVERLIST_ORMASKCOUNT || (start > 0 && !serverlist_ormasks[start].active) )
 		return;
 
-	if( !hostcache_viewcount ) {
-		_HostCache_ViewSet_InsertBefore( 0, entry );
+	if( !serverlist_viewcount ) {
+		_ServerList_ViewList_Helper_InsertBefore( 0, entry );
 		return;
 	}
 	// ok, insert it, we just need to find out where exactly:
 
 	// two special cases
 	// check whether to insert it as new first item
-	if( _HostCache_SortTest( entry, hostcache_viewset[0] ) ) {
-		_HostCache_ViewSet_InsertBefore( 0, entry );
+	if( _ServerList_Entry_Compare( entry, serverlist_viewlist[0] ) ) {
+		_ServerList_ViewList_Helper_InsertBefore( 0, entry );
 		return;
 	} // check whether to insert it as new last item
-	else if( !_HostCache_SortTest( entry, hostcache_viewset[hostcache_viewcount - 1] ) ) {
-		_HostCache_ViewSet_InsertBefore( hostcache_viewcount, entry );
+	else if( !_ServerList_Entry_Compare( entry, serverlist_viewlist[serverlist_viewcount - 1] ) ) {
+		_ServerList_ViewList_Helper_InsertBefore( serverlist_viewcount, entry );
 		return;
 	}
 	start = 0;
-	end = hostcache_viewcount - 1;
+	end = serverlist_viewcount - 1;
 	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] ) )
+		if( _ServerList_Entry_Compare( entry, serverlist_viewlist[mid] ) )
 			// the item has to be in the upper half
 			end = mid;
-		else 
+		else
 			// the item has to be in the lower half
 			start = mid;
 	}
-	_HostCache_ViewSet_InsertBefore( start + 1, entry );
+	_ServerList_ViewList_Helper_InsertBefore( start + 1, entry );
 }
 
-static void _HostCache_Remove( hostcache_t *entry )
+static void ServerList_ViewList_Remove( serverlist_entry_t *entry )
 {
 	int i;
-	for( i = 0; i < hostcache_viewcount; i++ )
+	for( i = 0; i < serverlist_viewcount; i++ )
 	{
-		if (hostcache_viewset[i] == entry)
+		if (serverlist_viewlist[i] == entry)
 		{
-			_HostCache_ViewSet_Remove(i);
+			_ServerList_ViewList_Helper_Remove(i);
 			break;
 		}
 	}
 }
 
-void HostCache_RebuildViewSet(void)
+void ServerList_RebuildViewList(void)
 {
 	int i;
-	
-	hostcache_viewcount = 0;
-	for( i = 0 ; i < hostcache_cachecount ; i++ )
-		if( hostcache_cache[i].finished )
-			_HostCache_Insert( &hostcache_cache[i] );
+
+	serverlist_viewcount = 0;
+	for( i = 0 ; i < serverlist_cachecount ; i++ )
+		if( serverlist_cache[i].query == SQS_QUERIED )
+			ServerList_ViewList_Insert( &serverlist_cache[i] );
 }
 
-void HostCache_ResetMask(void)
+void ServerList_ResetMasks(void)
 {
-	memset( &hostcache_currentmask, 0, sizeof( hostcache_mask_t ) );
+	memset( &serverlist_andmasks, 0, sizeof( serverlist_andmasks ) );
+	memset( &serverlist_ormasks, 0, sizeof( serverlist_ormasks ) );
 }
 
+#if 0
+static void _ServerList_Test(void)
+{
+	int i;
+	for( i = 0 ; i < 1024 ; i++ ) {
+		memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_entry_t ) );
+		serverlist_cache[serverlist_cachecount].info.ping = 1000 + 1024 - i;
+		dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, 128, "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 );
+		ServerList_ViewList_Insert( &serverlist_cache[serverlist_cachecount] );
+		serverlist_cachecount++;
+	}
+}
+#endif
 
-void HostCache_QueryList(void)
+void ServerList_QueryList(void)
 {
 	masterquerytime = realtime;
 	masterquerycount = 0;
 	masterreplycount = 0;
 	serverquerycount = 0;
 	serverreplycount = 0;
-	hostcache_cachecount = 0;
-	hostcache_viewcount = 0;
-	hostcache_consoleoutput = false;
-	NetConn_QueryMasters();
-}
+	serverlist_cachecount = 0;
+	serverlist_viewcount = 0;
+	serverlist_consoleoutput = false;
 
-#if 0
-static void _HostCache_PingTest(void)
-{
-	int i;
-	for( i = 0 ; i < 50 ; i++ ) {
-		memset( &hostcache_cache[hostcache_cachecount], 0, sizeof( hostcache_t ) );
-		hostcache_cache[hostcache_cachecount].info.ping = rand() % 450;
-		hostcache_cache[hostcache_cachecount].finished = true;
-		sprintf( hostcache_cache[hostcache_cachecount].line1, "%i", hostcache_cache[hostcache_cachecount].info.ping );
-		_HostCache_Insert( &hostcache_cache[hostcache_cachecount] );
-		hostcache_cachecount++;
-	}
+	//_ServerList_Test();
+
+	NetConn_QueryMasters();
 }
-#endif
 
 // rest
 
@@ -309,11 +383,13 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres
 {
 	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);
@@ -321,7 +397,7 @@ int NetConn_Read(lhnetsocket_t *mysocket, void *data, int maxlength, lhnetaddres
 		{
 			LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
 			Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i from %s:\n", mysocket, addressstring, data, maxlength, peeraddress, length, addressstring2);
-			Com_HexDumpToConsole(data, length);
+			Com_HexDumpToConsole((unsigned char *)data, length);
 		}
 		else
 			Con_Printf("LHNET_Read(%p (%s), %p, %i, %p) = %i\n", mysocket, addressstring, data, maxlength, peeraddress, length);
@@ -344,7 +420,7 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l
 		LHNETADDRESS_ToString(LHNET_AddressFromSocket(mysocket), addressstring, sizeof(addressstring), true);
 		LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
 		Con_Printf("LHNET_Write(%p (%s), %p, %i, %p (%s)) = %i%s\n", mysocket, addressstring, data, length, peeraddress, addressstring2, length, ret == length ? "" : " (ERROR)");
-		Com_HexDumpToConsole(data, length);
+		Com_HexDumpToConsole((unsigned char *)data, length);
 	}
 	return ret;
 }
@@ -352,7 +428,7 @@ int NetConn_Write(lhnetsocket_t *mysocket, const void *data, int length, const l
 int NetConn_WriteString(lhnetsocket_t *mysocket, const char *string, const lhnetaddress_t *peeraddress)
 {
 	// note this does not include the trailing NULL because we add that in the parser
-	return NetConn_Write(mysocket, string, strlen(string), peeraddress);
+	return NetConn_Write(mysocket, string, (int)strlen(string), peeraddress);
 }
 
 int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
@@ -364,13 +440,22 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
 
 //#ifdef DEBUG
 	if (data->cursize == 0)
-		Sys_Error("Datagram_SendMessage: zero length message\n");
+	{
+		Con_Printf ("Datagram_SendMessage: zero length message\n");
+		return -1;
+	}
 
 	if (data->cursize > (int)sizeof(conn->sendMessage))
-		Sys_Error("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage));
+	{
+		Con_Printf ("Datagram_SendMessage: message too big (%u > %u)\n", data->cursize, sizeof(conn->sendMessage));
+		return -1;
+	}
 
 	if (conn->canSend == false)
-		Sys_Error("SendMessage: called with canSend == false\n");
+	{
+		Con_Printf ("SendMessage: called with canSend == false\n");
+		return -1;
+	}
 //#endif
 
 	memcpy(conn->sendMessage, data->data, data->cursize);
@@ -389,7 +474,7 @@ int NetConn_SendReliableMessage(netconn_t *conn, sizebuf_t *data)
 
 	packetLen = NET_HEADERSIZE + dataLen;
 
-	header = (void *)sendbuffer;
+	header = (unsigned int *)sendbuffer;
 	header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
 	header[1] = BigLong(conn->sendSequence);
 	memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
@@ -428,7 +513,7 @@ static void NetConn_SendMessageNext(netconn_t *conn)
 
 		packetLen = NET_HEADERSIZE + dataLen;
 
-		header = (void *)sendbuffer;
+		header = (unsigned int *)sendbuffer;
 		header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
 		header[1] = BigLong(conn->sendSequence);
 		memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
@@ -466,7 +551,7 @@ static void NetConn_ReSendMessage(netconn_t *conn)
 
 		packetLen = NET_HEADERSIZE + dataLen;
 
-		header = (void *)sendbuffer;
+		header = (unsigned int *)sendbuffer;
 		header[0] = BigLong(packetLen | (NETFLAG_DATA | eom));
 		header[1] = BigLong(conn->sendSequence - 1);
 		memcpy(sendbuffer + NET_HEADERSIZE, conn->sendMessage, dataLen);
@@ -489,19 +574,25 @@ qboolean NetConn_CanSendMessage(netconn_t *conn)
 int NetConn_SendUnreliableMessage(netconn_t *conn, sizebuf_t *data)
 {
 	int packetLen;
-	int *header;
+	unsigned int *header;
 
 	packetLen = NET_HEADERSIZE + data->cursize;
 
 //#ifdef DEBUG
 	if (data->cursize == 0)
-		Sys_Error("Datagram_SendUnreliableMessage: zero length message\n");
+	{
+		Con_Printf ("Datagram_SendUnreliableMessage: zero length message\n");
+		return -1;
+	}
 
 	if (packetLen > (int)sizeof(sendbuffer))
-		Sys_Error("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize);
+	{
+		Con_Printf ("Datagram_SendUnreliableMessage: message too big %u\n", data->cursize);
+		return -1;
+	}
 //#endif
 
-	header = (void *)sendbuffer;
+	header = (unsigned int *)sendbuffer;
 	header[0] = BigLong(packetLen | NETFLAG_UNRELIABLE);
 	header[1] = BigLong(conn->unreliableSendSequence);
 	memcpy(sendbuffer + NET_HEADERSIZE, data->data, data->cursize);
@@ -570,29 +661,41 @@ void NetConn_OpenServerPort(const char *addressstring, int defaultport)
 {
 	lhnetaddress_t address;
 	lhnetsocket_t *s;
+	int port;
 	char addressstring2[1024];
-	if (LHNETADDRESS_FromString(&address, addressstring, defaultport))
+
+	for (port = defaultport; port <= defaultport + 100; port++)
 	{
-		if ((s = LHNET_OpenSocket_Connectionless(&address)))
+		if (LHNETADDRESS_FromString(&address, addressstring, port))
 		{
-			sv_sockets[sv_numsockets++] = s;
-			LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true);
-			Con_Printf("Server listening on address %s\n", addressstring2);
+			if ((s = LHNET_OpenSocket_Connectionless(&address)))
+			{
+				sv_sockets[sv_numsockets++] = s;
+				LHNETADDRESS_ToString(LHNET_AddressFromSocket(s), addressstring2, sizeof(addressstring2), true);
+				Con_Printf("Server listening on address %s\n", addressstring2);
+				break;
+			}
+			else
+			{
+				LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true);
+				Con_Printf("Server failed to open socket on address %s\n", addressstring2);
+			}
 		}
 		else
 		{
-			LHNETADDRESS_ToString(&address, addressstring2, sizeof(addressstring2), true);
-			Con_Printf("Server failed to open socket on address %s\n", addressstring2);
+			Con_Printf("Server unable to parse address %s\n", addressstring);
+			// if it cant parse one address, it wont be able to parse another for sure
+			break;
 		}
 	}
-	else
-		Con_Printf("Server unable to parse address %s\n", addressstring);
 }
 
+static void NetConn_UpdateServerStuff(void);
 void NetConn_OpenServerPorts(int opennetports)
 {
 	int port;
 	NetConn_CloseServerPorts();
+	NetConn_UpdateServerStuff();
 	port = bound(0, sv_netport.integer, 65535);
 	if (port == 0)
 		port = 26000;
@@ -631,7 +734,7 @@ lhnetsocket_t *NetConn_ChooseServerSocketForAddress(lhnetaddress_t *address)
 netconn_t *NetConn_Open(lhnetsocket_t *mysocket, lhnetaddress_t *peeraddress)
 {
 	netconn_t *conn;
-	conn = Mem_Alloc(netconn_mempool, sizeof(*conn));
+	conn = (netconn_t *)Mem_Alloc(netconn_mempool, sizeof(*conn));
 	conn->mysocket = mysocket;
 	conn->peeraddress = *peeraddress;
 	conn->canSend = true;
@@ -699,19 +802,20 @@ static void NetConn_UpdateServerStuff(void)
 	}
 }
 
-int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length)
+int NetConn_ReceivedMessage(netconn_t *conn, unsigned char *data, int length)
 {
 	unsigned int count;
 	unsigned int flags;
 	unsigned int sequence;
+	int qlength;
 
 	if (length >= 8)
 	{
-		length = BigLong(((int *)data)[0]);
-		flags = length & ~NETFLAG_LENGTH_MASK;
-		length &= NETFLAG_LENGTH_MASK;
+		qlength = (unsigned int)BigLong(((int *)data)[0]);
+		flags = qlength & ~NETFLAG_LENGTH_MASK;
+		qlength &= NETFLAG_LENGTH_MASK;
 		// control packets were already handled
-		if (!(flags & NETFLAG_CTL))
+		if (!(flags & NETFLAG_CTL) && qlength == length)
 		{
 			sequence = BigLong(((int *)data)[1]);
 			packetsReceived++;
@@ -779,14 +883,21 @@ int NetConn_ReceivedMessage(netconn_t *conn, qbyte *data, int length)
 				unsigned int temppacket[2];
 				temppacket[0] = BigLong(8 | NETFLAG_ACK);
 				temppacket[1] = BigLong(sequence);
-				NetConn_Write(conn->mysocket, (qbyte *)temppacket, 8, &conn->peeraddress);
+				NetConn_Write(conn->mysocket, (unsigned char *)temppacket, 8, &conn->peeraddress);
 				if (sequence == conn->receiveSequence)
 				{
 					conn->lastMessageTime = realtime;
 					conn->timeout = realtime + net_messagetimeout.value;
 					conn->receiveSequence++;
-					memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length);
-					conn->receiveMessageLength += length;
+					if( conn->receiveMessageLength + length <= (int)sizeof( conn->receiveMessage ) ) {
+						memcpy(conn->receiveMessage + conn->receiveMessageLength, data, length);
+						conn->receiveMessageLength += length;
+					} else {
+						Con_Printf( "Reliable message (seq: %i) too big for message buffer!\n"
+									"Dropping the message!\n", sequence );
+						conn->receiveMessageLength = 0;
+						return 1;
+					}
 					if (flags & NETFLAG_EOM)
 					{
 						reliableMessagesReceived++;
@@ -816,6 +927,10 @@ void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peer
 	M_Update_Return_Reason("");
 	// the connection request succeeded, stop current connection and set up a new connection
 	CL_Disconnect();
+	// if we're connecting to a remote server, shut down any local server
+	if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active)
+		Host_ShutdownServer (false);
+	// allocate a net connection to keep track of things
 	cls.netcon = NetConn_Open(mysocket, peeraddress);
 	Con_Printf("Connection accepted to %s\n", cls.netcon->address);
 	key_dest = key_game;
@@ -823,8 +938,6 @@ void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_t *peer
 	cls.demonum = -1;			// not in the demo loop now
 	cls.state = ca_connected;
 	cls.signon = 0;				// need all the signon messages before playing
-	CL_ClearState();
-	SCR_BeginLoadingPlaque();
 }
 
 int NetConn_IsLocalGame(void)
@@ -834,10 +947,9 @@ int NetConn_IsLocalGame(void)
 	return false;
 }
 
-int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress)
+int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
 {
 	int ret, c, control;
-	lhnetaddress_t svaddress;
 	const char *s;
 	char *string, addressstring2[128], cname[128], ipstring[32];
 	char stringbuf[16384];
@@ -862,10 +974,12 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 
 		if (length > 10 && !memcmp(string, "challenge ", 10) && cls.connect_trying)
 		{
+			char protocolnames[1400];
+			Protocol_Names(protocolnames, sizeof(protocolnames));
 			LHNETADDRESS_ToString(peeraddress, addressstring2, sizeof(addressstring2), true);
 			Con_Printf("\"%s\" received, sending connect request back to %s\n", string, addressstring2);
 			M_Update_Return_Reason("Got challenge response");
-			NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\challenge\\%s", string + 10), peeraddress);
+			NetConn_WriteString(mysocket, va("\377\377\377\377connect\\protocol\\darkplaces 3\\protocols\\%s\\challenge\\%s", protocolnames, string + 10), peeraddress);
 			return true;
 		}
 		if (length == 6 && !memcmp(string, "accept", 6) && cls.connect_trying)
@@ -887,21 +1001,39 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 		}
 		if (length >= 13 && !memcmp(string, "infoResponse\x0A", 13))
 		{
-			hostcache_info_t *info;
+			serverlist_info_t *info;
 			int i, n;
 			double pingtime;
-	
+
 			string += 13;
-			// hostcache only uses text addresses
+			// serverlist only uses text addresses
 			LHNETADDRESS_ToString(peeraddress, cname, sizeof(cname), true);
 			// search the cache for this server and update it
-			for( n = 0; n < hostcache_cachecount; n++ )
-				if( !strcmp( cname, hostcache_cache[n].info.cname ) )
+			for( n = 0; n < serverlist_cachecount; n++ )
+				if( !strcmp( cname, serverlist_cache[n].info.cname ) )
 					break;
-			if( n == hostcache_cachecount )
-				return true;
+			if( n == serverlist_cachecount ) {
+				// LAN search doesnt require an answer from the master server so we wont
+				// know the ping nor will it be initialized already...
+
+				// find a slot
+				if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
+					return true;
+
+				memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+				// store the data the engine cares about (address and ping)
+				strlcpy (serverlist_cache[serverlist_cachecount].info.cname, cname, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+				serverlist_cache[serverlist_cachecount].info.ping = 100000;
+				serverlist_cache[serverlist_cachecount].querytime = realtime;
+				// if not in the slist menu we should print the server to console
+				if (serverlist_consoleoutput) {
+					Con_Printf("querying %s\n", ipstring);
+				}
+
+				++serverlist_cachecount;
+			}
 
-			info = &hostcache_cache[n].info;
+			info = &serverlist_cache[n].info;
 			if ((s = SearchInfostring(string, "gamename"     )) != NULL) strlcpy(info->game, s, sizeof (info->game));else info->game[0] = 0;
 			if ((s = SearchInfostring(string, "modname"      )) != NULL) strlcpy(info->mod , s, sizeof (info->mod ));else info->mod[0]  = 0;
 			if ((s = SearchInfostring(string, "mapname"      )) != NULL) strlcpy(info->map , s, sizeof (info->map ));else info->map[0]  = 0;
@@ -913,7 +1045,7 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 			if (info->ping == 100000)
 					serverreplycount++;
 
-			pingtime = (int)((realtime - hostcache_cache[n].querytime) * 1000.0);
+			pingtime = (int)((realtime - serverlist_cache[n].querytime) * 1000.0);
 			pingtime = bound(0, pingtime, 9999);
 			// update the ping
 			info->ping = pingtime;
@@ -921,71 +1053,76 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 			// 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(serverlist_cache[n].line1, sizeof(serverlist_cache[n].line1), "%5d%c%3u/%3u %-65.65s", (int)pingtime, info->protocol != NET_PROTOCOL_VERSION ? '*' : ' ', info->numplayers, info->maxplayers, info->name);
+			dpsnprintf(serverlist_cache[n].line2, sizeof(serverlist_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)
 			{
 				// orange numbers (lower block)
 				for (i = 0;i < 5;i++)
-					if (hostcache_cache[n].line1[i] != ' ')
-						hostcache_cache[n].line1[i] += 128;
+					if (serverlist_cache[n].line1[i] != ' ')
+						serverlist_cache[n].line1[i] += 128;
 			}
 			else if (pingtime >= 200)
 			{
 				// yellow numbers (in upper block)
 				for (i = 0;i < 5;i++)
-					if (hostcache_cache[n].line1[i] != ' ')
-						hostcache_cache[n].line1[i] -= 30;
+					if (serverlist_cache[n].line1[i] != ' ')
+						serverlist_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);
+			if( serverlist_cache[n].query == SQS_QUERIED ) {
+				ServerList_ViewList_Remove( &serverlist_cache[n] );
+			}
+			// 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
-			if( hostcache_cache[n].finished )
-                _HostCache_Remove( &hostcache_cache[n] );
-			_HostCache_Insert( &hostcache_cache[n] );
-			hostcache_cache[n].finished = true;
+			ServerList_ViewList_Insert( &serverlist_cache[n] );
+			serverlist_cache[n].query = SQS_QUERIED;
 
 			return true;
 		}
-		if (!strncmp(string, "getserversResponse\\", 19) && hostcache_cachecount < HOSTCACHE_TOTALSIZE)
+		if (!strncmp(string, "getserversResponse\\", 19) && serverlist_cachecount < SERVERLIST_TOTALSIZE)
 		{
 			// Extract the IP addresses
 			data += 18;
 			length -= 18;
 			masterreplycount++;
-			if (hostcache_consoleoutput)
+			if (serverlist_consoleoutput)
 				Con_Print("received server list...\n");
 			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]);
+				int n;
+
+				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);				
-				// ignore the rest of the message if the hostcache is full
-				if( hostcache_cachecount == HOSTCACHE_TOTALSIZE )
+					Con_Printf("Requesting info from server %s\n", ipstring);
+				// ignore the rest of the message if the serverlist is full
+				if( serverlist_cachecount == SERVERLIST_TOTALSIZE )
 					break;
+				// also ignore it if we have already queried it (other master server response)
+				for( n = 0 ; n < serverlist_cachecount ; n++ )
+					if( !strcmp( ipstring, serverlist_cache[ n ].info.cname ) )
+						break;
+				if( n >= serverlist_cachecount )
+				{
+					serverquerycount++;
 
-				LHNETADDRESS_FromString(&svaddress, ipstring, 0);
-				NetConn_WriteString(mysocket, "\377\377\377\377getinfo", &svaddress);
+					memset(&serverlist_cache[serverlist_cachecount], 0, sizeof(serverlist_cache[serverlist_cachecount]));
+					// store the data the engine cares about (address and ping)
+					strlcpy (serverlist_cache[serverlist_cachecount].info.cname, ipstring, sizeof (serverlist_cache[serverlist_cachecount].info.cname));
+					serverlist_cache[serverlist_cachecount].info.ping = 100000;
+					serverlist_cache[serverlist_cachecount].query = SQS_QUERYING;
 
-				memset(&hostcache_cache[hostcache_cachecount], 0, sizeof(hostcache_cache[hostcache_cachecount]));
-				// store the data the engine cares about (address and ping)
-				strlcpy (hostcache_cache[hostcache_cachecount].info.cname, ipstring, sizeof (hostcache_cache[hostcache_cachecount].info.cname));
-				hostcache_cache[hostcache_cachecount].info.ping = 100000;
-				hostcache_cache[hostcache_cachecount].querytime = realtime;
-				// if not in the slist menu we should print the server to console
-				if (hostcache_consoleoutput)
-					Con_Printf("querying %s\n", ipstring);
-
-				++hostcache_cachecount;
+					++serverlist_cachecount;
+				}
 
 				// move on to next address in packet
 				data += 7;
 				length -= 7;
 			}
+			// begin or resume serverlist queries
+			serverlist_querysleep = false;
 			return true;
 		}
 		/*
@@ -1034,7 +1171,7 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 			if (developer.integer)
 				Con_Printf("Datagram_ParseConnectionless: received CCREP_REJECT from %s.\n", addressstring2);
 			cls.connect_trying = false;
-			M_Update_Return_Reason(data);
+			M_Update_Return_Reason((char *)data);
 			break;
 #if 0
 		case CCREP_SERVER_INFO:
@@ -1045,29 +1182,29 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 				// LordHavoc: because the UDP driver reports 0.0.0.0:26000 as the address
 				// string we just ignore it and keep the real address
 				MSG_ReadString();
-				// hostcache only uses text addresses
+				// serverlist only uses text addresses
 				cname = UDP_AddrToString(readaddr);
 				// search the cache for this server
 				for (n = 0; n < hostCacheCount; n++)
-					if (!strcmp(cname, hostcache[n].cname))
+					if (!strcmp(cname, serverlist[n].cname))
 						break;
 				// add it
-				if (n == hostCacheCount && hostCacheCount < HOSTCACHESIZE)
+				if (n == hostCacheCount && hostCacheCount < SERVERLISTSIZE)
 				{
 					hostCacheCount++;
-					memset(&hostcache[n], 0, sizeof(hostcache[n]));
-					strlcpy (hostcache[n].name, MSG_ReadString(), sizeof (hostcache[n].name));
-					strlcpy (hostcache[n].map, MSG_ReadString(), sizeof (hostcache[n].map));
-					hostcache[n].users = MSG_ReadByte();
-					hostcache[n].maxusers = MSG_ReadByte();
+					memset(&serverlist[n], 0, sizeof(serverlist[n]));
+					strlcpy (serverlist[n].name, MSG_ReadString(), sizeof (serverlist[n].name));
+					strlcpy (serverlist[n].map, MSG_ReadString(), sizeof (serverlist[n].map));
+					serverlist[n].users = MSG_ReadByte();
+					serverlist[n].maxusers = MSG_ReadByte();
 					c = MSG_ReadByte();
 					if (c != NET_PROTOCOL_VERSION)
 					{
-						strlcpy (hostcache[n].cname, hostcache[n].name, sizeof (hostcache[n].cname));
-						strcpy(hostcache[n].name, "*");
-						strlcat (hostcache[n].name, hostcache[n].cname, sizeof(hostcache[n].name));
+						strlcpy (serverlist[n].cname, serverlist[n].name, sizeof (serverlist[n].cname));
+						strcpy(serverlist[n].name, "*");
+						strlcat (serverlist[n].name, serverlist[n].cname, sizeof(serverlist[n].name));
 					}
-					strlcpy (hostcache[n].cname, cname, sizeof (hostcache[n].cname));
+					strlcpy (serverlist[n].cname, cname, sizeof (serverlist[n].cname));
 				}
 			}
 			break;
@@ -1095,6 +1232,71 @@ int NetConn_ClientParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 	return ret;
 }
 
+void NetConn_QueryQueueFrame(void)
+{
+	int index;
+	int queries;
+	int maxqueries;
+	double timeouttime;
+	static double querycounter = 0;
+
+	if (serverlist_querysleep)
+		return;
+
+	// each time querycounter reaches 1.0 issue a query
+	querycounter += host_realframetime * net_slist_queriespersecond.value;
+	maxqueries = (int)querycounter;
+	maxqueries = bound(0, maxqueries, net_slist_queriesperframe.integer);
+	querycounter -= maxqueries;
+
+	if( maxqueries == 0 ) {
+		return;
+	}
+
+	// scan serverlist and issue queries as needed
+    serverlist_querysleep = true;
+
+	timeouttime = realtime - net_slist_timeout.value;
+	for( index = 0, queries = 0 ; index < serverlist_cachecount && queries < maxqueries ; index++ )
+	{
+		serverlist_entry_t *entry = &serverlist_cache[ index ];
+		if( entry->query != SQS_QUERYING )
+		{
+			continue;
+		}
+
+        serverlist_querysleep = false;
+		if( entry->querycounter != 0 && entry->querytime > timeouttime )
+		{
+			continue;
+		}
+
+		if( entry->querycounter != (unsigned) net_slist_maxtries.integer )
+		{
+			lhnetaddress_t address;
+			int socket;
+
+			LHNETADDRESS_FromString(&address, entry->info.cname, 0);
+			for (socket = 0; socket < cl_numsockets ; socket++) {
+				NetConn_WriteString(cl_sockets[socket], "\377\377\377\377getinfo", &address);
+			}
+
+			entry->querytime = realtime;
+			entry->querycounter++;
+
+			// if not in the slist menu we should print the server to console
+			if (serverlist_consoleoutput)
+				Con_Printf("querying %25s (%i. try)\n", entry->info.cname, entry->querycounter);
+
+			queries++;
+		}
+		else
+		{
+			entry->query = SQS_TIMEDOUT;
+		}
+	}
+}
+
 void NetConn_ClientFrame(void)
 {
 	int i, length;
@@ -1104,13 +1306,15 @@ void NetConn_ClientFrame(void)
 	if (cls.connect_trying && cls.connect_nextsendtime < realtime)
 	{
 		if (cls.connect_remainingtries == 0)
+			M_Update_Return_Reason("Connect: Waiting 10 seconds for reply");
+		cls.connect_nextsendtime = realtime + 1;
+		cls.connect_remainingtries--;
+		if (cls.connect_remainingtries <= -10)
 		{
 			cls.connect_trying = false;
 			M_Update_Return_Reason("Connect: Failed");
 			return;
 		}
-		cls.connect_nextsendtime = realtime + 1;
-		cls.connect_remainingtries--;
 		// try challenge first (newer server)
 		NetConn_WriteString(cls.connect_mysocket, "\377\377\377\377getchallenge", &cls.connect_address);
 		// then try netquake as a fallback (old server, or netquake)
@@ -1124,9 +1328,12 @@ void NetConn_ClientFrame(void)
 		NetConn_Write(cls.connect_mysocket, net_message.data, net_message.cursize, &cls.connect_address);
 		SZ_Clear(&net_message);
 	}
-	for (i = 0;i < cl_numsockets;i++)
-		while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
+	for (i = 0;i < cl_numsockets;i++) {
+		while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0) {
 			NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress);
+		}
+	}
+	NetConn_QueryQueueFrame();
 	if (cls.netcon && realtime > cls.netcon->timeout)
 	{
 		Con_Print("Connection timed out\n");
@@ -1138,7 +1345,7 @@ void NetConn_ClientFrame(void)
 }
 
 #define MAX_CHALLENGES 128
-struct
+struct challenge_s
 {
 	lhnetaddress_t address;
 	double time;
@@ -1161,9 +1368,83 @@ static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
 	buffer[i] = 0;
 }
 
-int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length, lhnetaddress_t *peeraddress)
+static qboolean NetConn_BuildStatusResponse(const char* challenge, char* out_msg, size_t out_size, qboolean fullstatus)
+{
+	unsigned int nb_clients = 0, i;
+	int length;
+
+	// How many clients are there?
+	for (i = 0;i < (unsigned int)svs.maxclients;i++)
+		if (svs.clients[i].active)
+			nb_clients++;
+
+	// 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\\sv_maxclients\\%d"
+						"\\clients\\%d\\mapname\\%s\\hostname\\%s""\\protocol\\%d"
+						"%s%s"
+						"%s",
+						fullstatus ? "statusResponse" : "infoResponse",
+						gamename, com_modname, svs.maxclients,
+						nb_clients, sv.name, hostname.string, NET_PROTOCOL_VERSION,
+						challenge ? "\\challenge\\" : "", challenge ? challenge : "",
+						fullstatus ? "\n" : "");
+
+	// Make sure it fits in the buffer
+	if (length < 0)
+		return false;
+
+	if (fullstatus)
+	{
+		char *ptr;
+		int left;
+
+		ptr = out_msg + length;
+		left = (int)out_size - length;
+
+		for (i = 0;i < (unsigned int)svs.maxclients;i++)
+		{
+			client_t *cl = &svs.clients[i];
+			if (cl->active)
+			{
+				int nameind, cleanind;
+				char curchar;
+				char cleanname [sizeof(cl->name)];
+
+				// Remove all characters '"' and '\' in the player name
+				nameind = 0;
+				cleanind = 0;
+				do
+				{
+					curchar = cl->name[nameind++];
+					if (curchar != '"' && curchar != '\\')
+					{
+						cleanname[cleanind++] = curchar;
+						if (cleanind == sizeof(cleanname) - 1)
+							break;
+					}
+				} while (curchar != '\0');
+
+				length = dpsnprintf(ptr, left, "%d %d \"%s\"\n",
+									cl->frags,
+									(int)(cl->ping * 1000.0f),
+									cleanname);
+				if(length < 0)
+					return false;
+				left -= length;
+				ptr += length;
+			}
+		}
+	}
+
+	return true;
+}
+
+extern void SV_SendServerinfo (client_t *client);
+int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, unsigned char *data, int length, lhnetaddress_t *peeraddress)
 {
-	int i, n, ret, clientnum, responselength, best;
+	int i, ret, clientnum, best;
 	double besttime;
 	client_t *client;
 	netconn_t *conn;
@@ -1236,24 +1517,27 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 							for (clientnum = 0, client = svs.clients;clientnum < svs.maxclients;clientnum++, client++)
 								if (client->netconnection && LHNETADDRESS_Compare(peeraddress, &client->netconnection->peeraddress) == 0)
 									break;
-							if (clientnum < svs.maxclients)
+							if (clientnum < svs.maxclients && realtime - client->connecttime < net_messagerejointimeout.value)
+							{
+								// client is still trying to connect,
+								// so we send a duplicate reply
+								if (developer.integer)
+									Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2);
+								NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
+							}
+#if 0
+							else if (clientnum < svs.maxclients)
 							{
-								// duplicate connection request
-								if (realtime - client->connecttime < 2.0)
-								{
-									// client is still trying to connect,
-									// so we send a duplicate reply
-									if (developer.integer)
-										Con_Printf("Datagram_ParseConnectionless: sending duplicate accept to %s.\n", addressstring2);
-									NetConn_WriteString(mysocket, "\377\377\377\377accept", peeraddress);
-								}
-								// only kick if old connection seems dead
 								if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value)
 								{
-									// kick off connection and await retry
-									client->deadsocket = true;
+									// client crashed and is coming back, keep their stuff intact
+									SV_SendServerinfo(client);
+									//host_client = client;
+									//SV_DropClient (true);
 								}
+								// else ignore them
 							}
+#endif
 							else
 							{
 								// this is a new client, find a slot
@@ -1291,19 +1575,12 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 			if (length >= 7 && !memcmp(string, "getinfo", 7))
 			{
 				const char *challenge = NULL;
+
 				// If there was a challenge in the getinfo message
 				if (length > 8 && string[7] == ' ')
 					challenge = string + 8;
-				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"
-							"\\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 (NetConn_BuildStatusResponse(challenge, response, sizeof(response), false))
 				{
 					if (developer.integer)
 						Con_Printf("Sending reply to master %s - %s\n", addressstring2, response);
@@ -1311,6 +1588,22 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 				}
 				return true;
 			}
+			if (length >= 9 && !memcmp(string, "getstatus", 9))
+			{
+				const char *challenge = NULL;
+
+				// If there was a challenge in the getinfo message
+				if (length > 10 && string[9] == ' ')
+					challenge = string + 10;
+
+				if (NetConn_BuildStatusResponse(challenge, response, sizeof(response), true))
+				{
+					if (developer.integer)
+						Con_Printf("Sending reply to client %s - %s\n", addressstring2, response);
+					NetConn_WriteString(mysocket, response, peeraddress);
+				}
+				return true;
+			}
 			/*
 			if (!strncmp(string, "ping", 4))
 			{
@@ -1381,13 +1674,17 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 									NetConn_Write(mysocket, net_message.data, net_message.cursize, peeraddress);
 									SZ_Clear(&net_message);
 								}
+#if 0
 								else if (realtime - client->netconnection->lastMessageTime >= net_messagerejointimeout.value)
 								{
+									SV_SendServerinfo(client);
 									// the old client hasn't sent us anything
 									// in quite a while, so kick off and let
 									// the retry take care of it...
-									client->deadsocket = true;
+									//host_client = client;
+									//SV_DropClient (true);
 								}
+#endif
 							}
 							else
 							{
@@ -1479,7 +1776,7 @@ int NetConn_ServerParsePacket(lhnetsocket_t *mysocket, qbyte *data, int length,
 							MSG_WriteByte(&net_message, playerNumber);
 							MSG_WriteString(&net_message, client->name);
 							MSG_WriteLong(&net_message, client->colors);
-							MSG_WriteLong(&net_message, (int)client->edict->v->frags);
+							MSG_WriteLong(&net_message, (int)client->edict->fields.server->frags);
 							MSG_WriteLong(&net_message, (int)(realtime - client->connecttime));
 							MSG_WriteString(&net_message, client->netconnection ? client->netconnection->address : "botclient");
 							*((int *)net_message.data) = BigLong(NETFLAG_CTL | (net_message.cursize & NETFLAG_LENGTH_MASK));
@@ -1565,20 +1862,22 @@ void NetConn_QueryMasters(void)
 	int i;
 	int masternum;
 	lhnetaddress_t masteraddress;
+	lhnetaddress_t broadcastaddress;
 	char request[256];
 
-	if (hostcache_cachecount >= HOSTCACHE_TOTALSIZE)
+	if (serverlist_cachecount >= SERVERLIST_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);
@@ -1586,13 +1885,14 @@ void NetConn_QueryMasters(void)
 			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++)
@@ -1646,7 +1946,7 @@ void NetConn_Heartbeat(int priority)
 int NetConn_SendToAll(sizebuf_t *data, double blocktime)
 {
 	int i, count = 0;
-	qbyte sent[MAX_SCOREBOARD];
+	unsigned char sent[MAX_SCOREBOARD];
 
 	memset(sent, 0, sizeof(sent));
 
@@ -1712,28 +2012,30 @@ void Net_Stats_f(void)
 
 void Net_Slist_f(void)
 {
-	HostCache_ResetMask();
-	hostcache_sortbyfield = HCIF_PING;
-	hostcache_sortdescending = false;
+	ServerList_ResetMasks();
+	serverlist_sortbyfield = SLIF_PING;
+	serverlist_sortdescending = false;
     if (m_state != m_slist) {
 		Con_Print("Sending requests to master servers\n");
-		HostCache_QueryList();
-		hostcache_consoleoutput = true;
+		ServerList_QueryList();
+		serverlist_consoleoutput = true;
 		Con_Print("Listening for replies...\n");
 	} else
-		HostCache_QueryList();
-
-	//_HostCache_PingTest(); 
+		ServerList_QueryList();
 }
 
 void NetConn_Init(void)
 {
 	int i;
 	lhnetaddress_t tempaddress;
-	netconn_mempool = Mem_AllocPool("Networking", 0, NULL);
+	netconn_mempool = Mem_AllocPool("network connections", 0, NULL);
 	Cmd_AddCommand("net_stats", Net_Stats_f);
 	Cmd_AddCommand("net_slist", Net_Slist_f);
 	Cmd_AddCommand("heartbeat", Net_Heartbeat_f);
+	Cvar_RegisterVariable(&net_slist_queriespersecond);
+	Cvar_RegisterVariable(&net_slist_queriesperframe);
+	Cvar_RegisterVariable(&net_slist_timeout);
+	Cvar_RegisterVariable(&net_slist_maxtries);
 	Cvar_RegisterVariable(&net_messagetimeout);
 	Cvar_RegisterVariable(&net_messagerejointimeout);
 	Cvar_RegisterVariable(&net_connecttimeout);
@@ -1774,7 +2076,9 @@ void NetConn_Init(void)
 	}
 	cl_numsockets = 0;
 	sv_numsockets = 0;
-	SZ_Alloc(&net_message, NET_MAXMESSAGE, "net_message");
+	net_message.data = net_message_buf;
+	net_message.maxsize = sizeof(net_message_buf);
+	net_message.cursize = 0;
 	LHNET_Init();
 }