From 087014de2abdac199f7c3f2243f894908a130fc3 Mon Sep 17 00:00:00 2001 From: Austin Harris Date: Sun, 13 Aug 2017 10:27:45 -0600 Subject: [PATCH 1/2] Revert "stupid hard coded crap that needs a home in the config file" --- src/FedSrv/FedSrv.CPP | 4 ++-- src/WinTrek/ZoneClubScreen.cpp | 4 ++-- src/WinTrek/trekinput.cpp | 4 ++-- src/clintlib/clintlib.cpp | 16 ++++++++-------- src/lobby/pkcs5.cpp | 2 +- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/FedSrv/FedSrv.CPP b/src/FedSrv/FedSrv.CPP index 3d120bd3..654472d4 100644 --- a/src/FedSrv/FedSrv.CPP +++ b/src/FedSrv/FedSrv.CPP @@ -7755,9 +7755,9 @@ IHTTPSession * BeginConfigDownload() char szConfig[MAX_PATH]; #ifdef _ALLEGIANCE_PROD_ - Strcpy(szConfig, "http://azcdn.blob.core.windows.net/config/AZ.cfg"); //Imago 6/10 9/14 + Strcpy(szConfig, "http://autoupdate.allegiancezone.com/config/AZ.cfg"); //Imago 6/10 9/14 #else - Strcpy(szConfig, "http://azcdn.blob.core.windows.net/config/AZDev.cfg"); //Imago 6/10 9/14 + Strcpy(szConfig, "http://autoupdate.allegiancezone.com/config/AZDev.cfg"); //Imago 6/10 9/14 #endif CRegKey key; diff --git a/src/WinTrek/ZoneClubScreen.cpp b/src/WinTrek/ZoneClubScreen.cpp index f61cbfb2..29d9c638 100644 --- a/src/WinTrek/ZoneClubScreen.cpp +++ b/src/WinTrek/ZoneClubScreen.cpp @@ -389,9 +389,9 @@ class ZoneClubScreen : void BeginConfigDownload() { #ifdef _ALLEGIANCE_PROD_ - strcpy(m_szConfig, "http://azcdn.blob.core.windows.net/config/AZ.cfg"); //imago updated 7/4/09 9/14 + strcpy(m_szConfig, "http://autoupdate.allegiancezone.com/config/AZ.cfg"); //imago updated 7/4/09 9/14 #else - strcpy(m_szConfig, "http://azcdn.blob.core.windows.net/config/AZDev.cfg"); //imago updated 6/10 9/14 + strcpy(m_szConfig, "http://autoupdate.allegiancezone.com/config/AZDev.cfg"); //imago updated 6/10 9/14 #endif HKEY hKey; diff --git a/src/WinTrek/trekinput.cpp b/src/WinTrek/trekinput.cpp index 98450223..f96d3c66 100644 --- a/src/WinTrek/trekinput.cpp +++ b/src/WinTrek/trekinput.cpp @@ -2553,7 +2553,7 @@ class InputMapPopup : sprintf(settings.hdrs, "Content-Type: application/octet-stream\r\nUSER: %s\r\n", (PCC)UTL::char2hex((const unsigned char*)(PCC)strName, strName.GetLength())); Strcpy(settings.verb, "POST"); Strcpy(settings.uri, "/inputmap.cgi"); - Strcpy(settings.host, "imago.buildvideogames.com"); + Strcpy(settings.host, "azforum.cloudapp.net"); ZeroMemory(settings.data, BUFFSIZE); settings.data[0] = 0x00; settings.size = 0; @@ -2581,7 +2581,7 @@ class InputMapPopup : sprintf(settings.hdrs, "USER: %s\r\n", (PCC)UTL::char2hex((const unsigned char*)(PCC)strName, strName.GetLength())); Strcpy(settings.verb, "GET"); Strcpy(settings.uri, "/inputmap.cgi"); - Strcpy(settings.host, "imago.buildvideogames.com"); + Strcpy(settings.host, "azforum.cloudapp.net"); settings.pPopup = this; ZeroMemory(settings.data, BUFFSIZE); settings.data[0] = 0x00; diff --git a/src/clintlib/clintlib.cpp b/src/clintlib/clintlib.cpp index 630155ec..7978e26b 100644 --- a/src/clintlib/clintlib.cpp +++ b/src/clintlib/clintlib.cpp @@ -4147,34 +4147,34 @@ void CfgInfo::Load(const char * szConfig) const char * c_szCfgApp = "Allegiance"; char szStr[128]; // random number; - GetPrivateProfileStringA(c_szCfgApp, "ZAuth", "imago.buildvideogames.com", + GetPrivateProfileStringA(c_szCfgApp, "ZAuth", "azforum.cloudapp.net", szStr, sizeof(szStr), szConfig); strZAuth = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ClubLobby", "imago.buildvideogames.com", + GetPrivateProfileStringA(c_szCfgApp, "ClubLobby", "allegiancezone.cloudapp.net", szStr, sizeof(szStr), szConfig); strClubLobby = szStr; - GetPrivateProfileStringA(c_szCfgApp, "PublicLobby", "imago.buildvideogames.com", + GetPrivateProfileStringA(c_szCfgApp, "PublicLobby", "allegiancezone.cloudapp.net", szStr, sizeof(szStr), szConfig); strPublicLobby = szStr; - GetPrivateProfileStringA(c_szCfgApp, "Club", "imago.buildvideogames.com", + GetPrivateProfileStringA(c_szCfgApp, "Club", "allegiancezone.cloudapp.net", szStr, sizeof(szStr), szConfig); strClub = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ClubMessageURL", "http://azcdn.blob.core.windows.net/config/club/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl + GetPrivateProfileStringA(c_szCfgApp, "ClubMessageURL", "http://autoupdate.allegiancezone.com/config/club/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl szStr, sizeof(szStr), szConfig); strClubMessageURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "PublicMessageURL", "http://azcdn.blob.core.windows.net/config/beta/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl + GetPrivateProfileStringA(c_szCfgApp, "PublicMessageURL", "http://autoupdate.allegiancezone.com/config/beta/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl szStr, sizeof(szStr), szConfig); strPublicMessageURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ZoneEventsURL", "http://azcdn.blob.core.windows.net/config/event/events.mdl", szStr, sizeof(szStr), szConfig); + GetPrivateProfileStringA(c_szCfgApp, "ZoneEventsURL", "http://autoupdate.allegiancezone.com/config/event/events.mdl", szStr, sizeof(szStr), szConfig); strZoneEventsURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ZoneEventDetailsURL", "http://azcdn.blob.core.windows.net/config/event/", + GetPrivateProfileStringA(c_szCfgApp, "ZoneEventDetailsURL", "http://autoupdate.allegiancezone.com/config/event/", szStr, sizeof(szStr), szConfig); strZoneEventDetailsURL = szStr; diff --git a/src/lobby/pkcs5.cpp b/src/lobby/pkcs5.cpp index 2e0ef50d..a14aa045 100644 --- a/src/lobby/pkcs5.cpp +++ b/src/lobby/pkcs5.cpp @@ -445,7 +445,7 @@ bool IsRFC2898Valid(char * szUser, char * szPass, char * szReason, int & iID) { char szHdrs[512]; sprintf(szHdrs,"USER: %s\r\n",szUser); - ZString Response = UTL::DoHTTP(szHdrs,"imago.buildvideogames.com","GET","/lobbylogon.cgi","",0,true); + ZString Response = UTL::DoHTTP(szHdrs,"azforum.cloudapp.net","GET","/lobbylogon.cgi","",0,true); char * szToken; char * szRes = (char*)_alloca(512); Strcpy(szRes,(PCC)Response); From 9f7799ef9f94ea5aa12d5414e3b43279e07ed5a9 Mon Sep 17 00:00:00 2001 From: ImagoTrigger Date: Mon, 14 Aug 2017 21:44:44 -0500 Subject: [PATCH 2/2] allegiancezone.com for the game web services, ashx for the handlers --- src/FedSrv/FedSrv.CPP | 4 ++-- src/WinTrek/ZoneClubScreen.cpp | 4 ++-- src/WinTrek/trekinput.cpp | 8 ++++---- src/clintlib/clintlib.cpp | 16 ++++++++-------- src/lobby/pkcs5.cpp | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/FedSrv/FedSrv.CPP b/src/FedSrv/FedSrv.CPP index 654472d4..3d120bd3 100644 --- a/src/FedSrv/FedSrv.CPP +++ b/src/FedSrv/FedSrv.CPP @@ -7755,9 +7755,9 @@ IHTTPSession * BeginConfigDownload() char szConfig[MAX_PATH]; #ifdef _ALLEGIANCE_PROD_ - Strcpy(szConfig, "http://autoupdate.allegiancezone.com/config/AZ.cfg"); //Imago 6/10 9/14 + Strcpy(szConfig, "http://azcdn.blob.core.windows.net/config/AZ.cfg"); //Imago 6/10 9/14 #else - Strcpy(szConfig, "http://autoupdate.allegiancezone.com/config/AZDev.cfg"); //Imago 6/10 9/14 + Strcpy(szConfig, "http://azcdn.blob.core.windows.net/config/AZDev.cfg"); //Imago 6/10 9/14 #endif CRegKey key; diff --git a/src/WinTrek/ZoneClubScreen.cpp b/src/WinTrek/ZoneClubScreen.cpp index 29d9c638..f61cbfb2 100644 --- a/src/WinTrek/ZoneClubScreen.cpp +++ b/src/WinTrek/ZoneClubScreen.cpp @@ -389,9 +389,9 @@ class ZoneClubScreen : void BeginConfigDownload() { #ifdef _ALLEGIANCE_PROD_ - strcpy(m_szConfig, "http://autoupdate.allegiancezone.com/config/AZ.cfg"); //imago updated 7/4/09 9/14 + strcpy(m_szConfig, "http://azcdn.blob.core.windows.net/config/AZ.cfg"); //imago updated 7/4/09 9/14 #else - strcpy(m_szConfig, "http://autoupdate.allegiancezone.com/config/AZDev.cfg"); //imago updated 6/10 9/14 + strcpy(m_szConfig, "http://azcdn.blob.core.windows.net/config/AZDev.cfg"); //imago updated 6/10 9/14 #endif HKEY hKey; diff --git a/src/WinTrek/trekinput.cpp b/src/WinTrek/trekinput.cpp index f96d3c66..3bb06cc9 100644 --- a/src/WinTrek/trekinput.cpp +++ b/src/WinTrek/trekinput.cpp @@ -2552,8 +2552,8 @@ class InputMapPopup : pHTTP settings; sprintf(settings.hdrs, "Content-Type: application/octet-stream\r\nUSER: %s\r\n", (PCC)UTL::char2hex((const unsigned char*)(PCC)strName, strName.GetLength())); Strcpy(settings.verb, "POST"); - Strcpy(settings.uri, "/inputmap.cgi"); - Strcpy(settings.host, "azforum.cloudapp.net"); + Strcpy(settings.uri, "/inputmap.ashx"); + Strcpy(settings.host, "allegiancezone.com"); ZeroMemory(settings.data, BUFFSIZE); settings.data[0] = 0x00; settings.size = 0; @@ -2580,8 +2580,8 @@ class InputMapPopup : pHTTP settings; sprintf(settings.hdrs, "USER: %s\r\n", (PCC)UTL::char2hex((const unsigned char*)(PCC)strName, strName.GetLength())); Strcpy(settings.verb, "GET"); - Strcpy(settings.uri, "/inputmap.cgi"); - Strcpy(settings.host, "azforum.cloudapp.net"); + Strcpy(settings.uri, "/inputmap.ashx"); + Strcpy(settings.host, "allegiancezone.com"); settings.pPopup = this; ZeroMemory(settings.data, BUFFSIZE); settings.data[0] = 0x00; diff --git a/src/clintlib/clintlib.cpp b/src/clintlib/clintlib.cpp index 7978e26b..630155ec 100644 --- a/src/clintlib/clintlib.cpp +++ b/src/clintlib/clintlib.cpp @@ -4147,34 +4147,34 @@ void CfgInfo::Load(const char * szConfig) const char * c_szCfgApp = "Allegiance"; char szStr[128]; // random number; - GetPrivateProfileStringA(c_szCfgApp, "ZAuth", "azforum.cloudapp.net", + GetPrivateProfileStringA(c_szCfgApp, "ZAuth", "imago.buildvideogames.com", szStr, sizeof(szStr), szConfig); strZAuth = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ClubLobby", "allegiancezone.cloudapp.net", + GetPrivateProfileStringA(c_szCfgApp, "ClubLobby", "imago.buildvideogames.com", szStr, sizeof(szStr), szConfig); strClubLobby = szStr; - GetPrivateProfileStringA(c_szCfgApp, "PublicLobby", "allegiancezone.cloudapp.net", + GetPrivateProfileStringA(c_szCfgApp, "PublicLobby", "imago.buildvideogames.com", szStr, sizeof(szStr), szConfig); strPublicLobby = szStr; - GetPrivateProfileStringA(c_szCfgApp, "Club", "allegiancezone.cloudapp.net", + GetPrivateProfileStringA(c_szCfgApp, "Club", "imago.buildvideogames.com", szStr, sizeof(szStr), szConfig); strClub = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ClubMessageURL", "http://autoupdate.allegiancezone.com/config/club/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl + GetPrivateProfileStringA(c_szCfgApp, "ClubMessageURL", "http://azcdn.blob.core.windows.net/config/club/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl szStr, sizeof(szStr), szConfig); strClubMessageURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "PublicMessageURL", "http://autoupdate.allegiancezone.com/config/beta/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl + GetPrivateProfileStringA(c_szCfgApp, "PublicMessageURL", "http://azcdn.blob.core.windows.net/config/beta/motd.mdl", // http://a-markcu1/test/messageoftheday.mdl szStr, sizeof(szStr), szConfig); strPublicMessageURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ZoneEventsURL", "http://autoupdate.allegiancezone.com/config/event/events.mdl", szStr, sizeof(szStr), szConfig); + GetPrivateProfileStringA(c_szCfgApp, "ZoneEventsURL", "http://azcdn.blob.core.windows.net/config/event/events.mdl", szStr, sizeof(szStr), szConfig); strZoneEventsURL = szStr; - GetPrivateProfileStringA(c_szCfgApp, "ZoneEventDetailsURL", "http://autoupdate.allegiancezone.com/config/event/", + GetPrivateProfileStringA(c_szCfgApp, "ZoneEventDetailsURL", "http://azcdn.blob.core.windows.net/config/event/", szStr, sizeof(szStr), szConfig); strZoneEventDetailsURL = szStr; diff --git a/src/lobby/pkcs5.cpp b/src/lobby/pkcs5.cpp index a14aa045..cc0dc29f 100644 --- a/src/lobby/pkcs5.cpp +++ b/src/lobby/pkcs5.cpp @@ -445,7 +445,7 @@ bool IsRFC2898Valid(char * szUser, char * szPass, char * szReason, int & iID) { char szHdrs[512]; sprintf(szHdrs,"USER: %s\r\n",szUser); - ZString Response = UTL::DoHTTP(szHdrs,"azforum.cloudapp.net","GET","/lobbylogon.cgi","",0,true); + ZString Response = UTL::DoHTTP(szHdrs,"allegiancezone.com","GET","/lobbylogon.ashx","",0,true); char * szToken; char * szRes = (char*)_alloca(512); Strcpy(szRes,(PCC)Response);