implemented caching of DNS names in lhnet.c

[xonotic/darkplaces.git] / netconn.c

diff --git a/netconn.c b/netconn.c
index b1f699218f61aa013472e7108138d4533c463fac..307ae43d861f4c26ec4962df857d22c4d8a3e86b 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -35,9 +35,9 @@ 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_masterextra3", "12.166.196.192"}, // blaze.mindphukd.org
+       {0, "sv_masterextra1", "ghdigital.com"}, //69.59.212.88
+       {0, "sv_masterextra2", "dpmaster.deathmask.net"}, //209.164.24.243
+       {0, "sv_masterextra3", "blaze.mindphukd.org"}, //12.166.196.192
        {0, NULL, NULL}
 };
 
@@ -186,6 +186,8 @@ static qboolean _ServerList_CompareInt( int A, serverlist_maskop_t op, int 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" );
@@ -332,7 +334,7 @@ static void _ServerList_Test(void)
 {
        int i;
        for( i = 0 ; i < 1024 ; i++ ) {
-               memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_t ) );
+               memset( &serverlist_cache[serverlist_cachecount], 0, sizeof( serverlist_entry_t ) );
                serverlist_cache[serverlist_cachecount].info.ping = rand() % 450 + 250;
                dpsnprintf( serverlist_cache[serverlist_cachecount].info.name, 128, "Black's ServerList Test %i", i );
                serverlist_cache[serverlist_cachecount].finished = true;
@@ -1167,13 +1169,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)