ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10634 from OatmealDome/netsysupdate-nogui 

WiiUtils: Change default NUS Shop URL to Dolphin's fake NUS
This commit is contained in:
JMC47 2022-05-06 00:13:56 -04:00 committed by GitHub
parent d0ed09ab6f baabd63f81
commit 8335ec70e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Config/MainSettings.cpp
View File

@ -210,6 +210,9 @@ const Info<bool> MAIN_ENABLE_SAVESTATES{{System::Main, "Core", "EnableSaveStates
const Info<bool> MAIN_REAL_WII_REMOTE_REPEAT_REPORTS{ const Info<bool> MAIN_REAL_WII_REMOTE_REPEAT_REPORTS{
{System::Main, "Core", "RealWiiRemoteRepeatReports"}, true}; {System::Main, "Core", "RealWiiRemoteRepeatReports"}, true};
// Empty means use the Dolphin default URL
const Info<std::string> MAIN_WII_NUS_SHOP_URL{{System::Main, "Core", "WiiNusShopUrl"}, ""};
// Main.Display // Main.Display
const Info<std::string> MAIN_FULLSCREEN_DISPLAY_RES{ const Info<std::string> MAIN_FULLSCREEN_DISPLAY_RES{

1
Source/Core/Core/Config/MainSettings.h
View File

@ -131,6 +131,7 @@ extern const Info<bool> MAIN_ENABLE_SAVESTATES;
extern const Info<DiscIO::Region> MAIN_FALLBACK_REGION; extern const Info<DiscIO::Region> MAIN_FALLBACK_REGION;
extern const Info<bool> MAIN_REAL_WII_REMOTE_REPEAT_REPORTS; extern const Info<bool> MAIN_REAL_WII_REMOTE_REPEAT_REPORTS;
extern const Info<s32> MAIN_OVERRIDE_BOOT_IOS; extern const Info<s32> MAIN_OVERRIDE_BOOT_IOS;
extern const Info<std::string> MAIN_WII_NUS_SHOP_URL;
// Main.DSP // Main.DSP

21
Source/Core/Core/WiiUtils.cpp
View File

@ -458,11 +458,24 @@ OnlineSystemUpdater::Response OnlineSystemUpdater::GetSystemTitles()
doc.save(stream); doc.save(stream);
const std::string request = stream.str(); const std::string request = stream.str();
// Note: We don't use HTTPS because that would require the user to have std::string base_url = Config::Get(Config::MAIN_WII_NUS_SHOP_URL);
// a device certificate which cannot be redistributed with Dolphin. if (base_url.empty())
// This is fine, because IOS has signature checks. {
// The NUS servers for the Wii are offline (https://bugs.dolphin-emu.org/issues/12865),
// but the backing data CDN is still active and accessible from other URLs. We take advantage
// of this by hosting our own NetUpdateSOAP endpoint which serves the correct list of titles to
// install along with URLs for the Wii U CDN.
#ifdef ANDROID
// HTTPS is unsupported on Android (https://bugs.dolphin-emu.org/issues/11772).
base_url = "http://fakenus.dolphin-emu.org";
#else
base_url = "https://fakenus.dolphin-emu.org";
#endif
}
const std::string url = fmt::format("{}/nus/services/NetUpdateSOAP", base_url);
const Common::HttpRequest::Response response = const Common::HttpRequest::Response response =
m_http.Post("http://nus.shop.wii.com/nus/services/NetUpdateSOAP", request, m_http.Post(url, request,
{ {
{"SOAPAction", "urn:nus.wsapi.broadon.com/GetSystemUpdate"}, {"SOAPAction", "urn:nus.wsapi.broadon.com/GetSystemUpdate"},
{"User-Agent", "wii libnup/1.0"}, {"User-Agent", "wii libnup/1.0"},