diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp index 16ba285..1ee9c1e 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.cpp @@ -54,7 +54,7 @@ nn::Result NinjaCommunicator::GetNsUid(const char* baseUrl, nn::ProgramId progra return HttpCommunicationCore(url); } -nn::Result NinjaCommunicator::GetExternalKeyInfo(const char* baseUrl, const char* nsUid, const char* countryCode) +nn::Result NinjaCommunicator::GetEcInfo(const char* baseUrl, const char* nsUid, const char* countryCode) { if(!nn::ac::IsConnected()) { @@ -63,7 +63,7 @@ nn::Result NinjaCommunicator::GetExternalKeyInfo(const char* baseUrl, const char } std::string url(baseUrl); - GenerateUrlForGetExternalKeyInfo(url, nsUid, countryCode); + GenerateUrlForEcInfo(url, nsUid, countryCode); return HttpCommunicationCore(url); } @@ -124,7 +124,7 @@ void NinjaCommunicator::GenerateUrlForNsUid(std::string& url, nn::ProgramId prog NN_LOG("URL=%s\n", url.c_str()); } -void NinjaCommunicator::GenerateUrlForGetExternalKeyInfo(std::string& url, const char* nsUid, const char* countryCode) +void NinjaCommunicator::GenerateUrlForEcInfo(std::string& url, const char* nsUid, const char* countryCode) { url.append(countryCode); url.append("/title/"); diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h index c613d34..09c3d8e 100644 --- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h +++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NinjaCommunicator.h @@ -32,8 +32,8 @@ public: //! @param[in] url 接続先URL nn::Result GetNsUid(const char* baseUrl, nn::ProgramId programId); - //! @Ninjaと通信して外部鍵情報を取得します - nn::Result GetExternalKeyInfo(const char* baseUrl, const char* nsUid, const char* countryCode); + //! @Ninjaと通信してec_infoを取得します + nn::Result GetEcInfo(const char* baseUrl, const char* nsUid, const char* countryCode); //! @brief 通信結果をバッファに書き込みます。 //! @param[out] buf 通信結果を書き込むバッファ @@ -45,7 +45,7 @@ public: private: nn::Result HttpCommunicationCore(std::string url); void GenerateUrlForNsUid(std::string& url, nn::ProgramId programId); - void GenerateUrlForGetExternalKeyInfo(std::string& url, const char* nsUid, const char* countryCode); + void GenerateUrlForEcInfo(std::string& url, const char* nsUid, const char* countryCode); //Connectionインスタンス nn::http::Connection m_HttpCon; diff --git a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp index 3885424..c6ba578 100644 --- a/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp +++ b/trunk/ConsoleDataMigration/sources/tests/ConsoleRestore/NinjaCommunicator/test_NinjaCommunicator.cpp @@ -127,7 +127,7 @@ void TestNinjaCommunicator::GetExternalKeyInfo() ConsoleRestore::NinjaCommunicator ninja; NN_TEST_ASSERT( - ninja.GetExternalKeyInfo("https://ninja.ctr.shop.nintendo.net/ninja/ws/", "50010000041101", "JP").IsSuccess()); + ninja.GetEcInfo("https://ninja.ctr.shop.nintendo.net/ninja/ws/", "50010000041101", "JP").IsSuccess()); size_t bufSize = 1024 * 1024; // 1MB common::HeapManager heap(bufSize);