edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use https for map downloads by default

Browse source
This commit is contained in:
def 2017-07-16 11:29:10 +02:00
parent 191eefbb2f
commit e4364983ab
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/engine/client/client.cpp
View file

@ -1632,14 +1632,14 @@ void CClient::ProcessServerPacket(CNetChunk *pPacket)
str_format(aFilename, sizeof(aFilename), "%s_%08x.map", pMap, MapCrc);
Fetcher()->Escape(aEscaped, sizeof(aEscaped), aFilename);
str_format(aUrl, sizeof(aUrl), "%s/", g_Config.m_ClDDNetMapServer);
str_format(aUrl, sizeof(aUrl), "%s/", g_Config.m_ClDDNetMapDownloadUrl);
// We only trust our own custom-selected CAs for our own servers.
// Other servers can use any CA trusted by the system.
bool UseDDNetCA =
str_comp_nocase_num("maps.ddnet.tw/", g_Config.m_ClDDNetMapServer, 14) == 0 ||
str_comp_nocase_num("http://maps.ddnet.tw/", g_Config.m_ClDDNetMapServer, 21) == 0 ||
str_comp_nocase_num("https://maps.ddnet.tw/", g_Config.m_ClDDNetMapServer, 22) == 0;
str_comp_nocase_num("maps.ddnet.tw/", g_Config.m_ClDDNetMapDownloadUrl, 14) == 0 ||
str_comp_nocase_num("http://maps.ddnet.tw/", g_Config.m_ClDDNetMapDownloadUrl, 21) == 0 ||
str_comp_nocase_num("https://maps.ddnet.tw/", g_Config.m_ClDDNetMapDownloadUrl, 22) == 0;
str_append(aUrl, aEscaped, sizeof(aUrl));

2
src/game/variables.h
View file

@ -73,7 +73,7 @@ MACRO_CONFIG_INT(ClMotdTime, cl_motd_time, 10, 0, 100, CFGFLAG_CLIENT|CFGFLAG_SA
MACRO_CONFIG_STR(ClDDNetVersionServer, cl_ddnet_version_server, 100, "version.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to check for new ddnet versions")
MACRO_CONFIG_STR(ClDDNetUpdate2Server, cl_ddnet_update2_server, 100, "update2.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to update new ddnet versions")
MACRO_CONFIG_STR(ClDDNetMapServer, cl_ddnet_maps_server, 100, "maps.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "Server to use to download maps")
MACRO_CONFIG_STR(ClDDNetMapDownloadUrl, cl_ddnet_map_download_url, 100, "https://maps.ddnet.tw", CFGFLAG_CLIENT|CFGFLAG_SAVE, "URL to use to download maps (can start with http:// or https://)")
MACRO_CONFIG_STR(ClLanguagefile, cl_languagefile, 255, "", CFGFLAG_CLIENT|CFGFLAG_SAVE, "What language file to use")
MACRO_CONFIG_INT(ClVanillaSkinsOnly, cl_vanilla_skins_only, 0, 0, 1, CFGFLAG_CLIENT|CFGFLAG_SAVE, "Only show skins available in Vanilla Teeworlds")