From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Wed, 16 Mar 2016 03:23:18 +0000 (+0000)
Subject: Changed master server IP addresses back to hostnames so they don't go
X-Git-Tag: xonotic-v0.8.2~42
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=24e0784d14f2f7c24e7a44701162e1f988f11672;p=xonotic%2Fdarkplaces.git

Changed master server IP addresses back to hostnames so they don't go
stale.

Removed dead master servers.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12251 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=cff801cfc3a8bcdbe6a4128660013c1c1ee4bd6c
---

diff --git a/netconn.c b/netconn.c
index 0d5c5a9d..a01c174c 100755
--- a/netconn.c
+++ b/netconn.c
@@ -44,13 +44,9 @@ static cvar_t sv_masters [] =
 	{CVAR_SAVE, "sv_master2", "", "user-chosen master server 2"},
 	{CVAR_SAVE, "sv_master3", "", "user-chosen master server 3"},
 	{CVAR_SAVE, "sv_master4", "", "user-chosen master server 4"},
-	{0, "sv_masterextra1", "69.59.212.88", "ghdigital.com - default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc
-	{0, "sv_masterextra2", "107.161.23.68", "dpmaster.deathmask.net - default master server 2 (admin: Willis)"}, // admin: Willis
-	{0, "sv_masterextra3", "92.62.40.73", "dpmaster.tchr.no - default master server 3 (admin: tChr)"}, // admin: tChr
-#ifndef NOSUPPORTIPV6
-	{0, "sv_masterextra4", "[2a03:4000:2:225::51:334d]:27950", "dpmaster.sudo.rm-f.org - default master server 4 (admin: divVerent)"}, // admin: divVerent
-	{0, "sv_masterextra5", "[2604:180::4ac:98c1]:27950", "dpmaster.deathmask.net - default master server 5 ipv6 address of dpmaster.deathmask.net (admin: Willis)"}, // admin: Willis
-#endif
+	{0, "sv_masterextra1", "ghdigital.com", "ghdigital.com - default master server 1 (admin: LordHavoc)"}, // admin: LordHavoc
+	{0, "sv_masterextra2", "dpmaster.deathmask.net", "dpmaster.deathmask.net - default master server 2 (admin: Willis)"}, // admin: Willis
+	{0, "sv_masterextra3", "dpmaster.tchr.no", "dpmaster.tchr.no - default master server 3 (admin: tChr)"}, // admin: tChr
 	{0, NULL, NULL, NULL}
 };
 
@@ -64,8 +60,7 @@ static cvar_t sv_qwmasters [] =
 	{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", "qwmaster.fodquake.net:27000", "Global master server. (admin: unknown)"},
+	{0, "sv_qwmasterextra4", "qwmaster.fodquake.net:27000", "Global master server. (admin: unknown)"},
 	{0, NULL, NULL, NULL}
 };
 #endif