rvtr/ctr_Repair
1
Fork 0
mirror of https://github.com/rvtr/ctr_Repair.git synced 2025-10-31 13:51:08 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

PANICしないように

Browse Source 
UpdateNetworkSettingではFlushしないように

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@6 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-02-01 02:40:50 +00:00
parent 6c279d66be
commit 88d11db75a
2 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
trunk/ConsoleDataMigration/ConsoleRestore/Importer.cpp
View File

@ -683,7 +683,7 @@ bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
if(result.IsFailure())
{
retval = false;
NN_LOG("Error: nn::ac::InitializeInternal() failed\n");
COMMON_LOGGER("Error: nn::ac::InitializeInternal() failed\n");
}
else
{
@ -710,24 +710,15 @@ bool UpdateNetworkSetting(nn::ac::NetworkSetting& networkSetting)
if(!result.IsSuccess())
{
retval = false;
NN_LOG("Error: SetNetworkSetting (Update Error)\n");
COMMON_LOGGER("Error: SetNetworkSetting (Update Error)\n");
}
else
{
result = nn::ac::FlushNetworkSetting();
if(!result.IsSuccess())
result = nn::ac::FinalizeInternal();
if (!result.IsSuccess())
{
retval = false;
NN_LOG("Error: SetNetworkSetting (Flush Error)\n");
}
else
{
result = nn::ac::FinalizeInternal();
if(!result.IsSuccess())
{
retval = false;
NN_LOG("Error: SetNetworkSetting (Finalize Error)\n");
}
COMMON_LOGGER("Error: SetNetworkSetting (Finalize Error)\n");
}
}
}

18
trunk/ConsoleDataMigration/ConsoleRestore/NtpClient.cpp
View File

@ -60,13 +60,13 @@ const u32 NTP_PORT_NUM = 123;
nn::fs::Initialize();
result = nn::ac::Initialize();
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// 接続要求用のパラメータを作成
result = nn::ac::CreateDefaultConfig( &config );
if (result.IsFailure())
{
NN_UTIL_PANIC_IF_FAILED(nn::ac::Finalize());
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
return result;
}
@ -77,7 +77,7 @@ const u32 NTP_PORT_NUM = 123;
result = nn::ac::Connect( config );
if (result.IsFailure())
{
NN_UTIL_PANIC_IF_FAILED(nn::ac::Finalize());
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
return result;
}
@ -93,7 +93,7 @@ const u32 NTP_PORT_NUM = 123;
NN_UTIL_RETURN_IF_FAILED(result);
result = nn::ac::Finalize();
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
nn::fs::Finalize();
@ -110,7 +110,7 @@ u32 GetNtpTime()
// 本体に書き込まれているネットワーク設定を使ってネットワーク接続を初期化
result = InitializeNetwork();
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
NN_LOG("Initializing socket..\n");
@ -128,7 +128,7 @@ u32 GetNtpTime()
// ソケットライブラリの初期化
result = nn::socket::Initialize(workMemoryAddress, workSizeForLibrary, bufferSizeForSockets, sessionCount);
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
{
s32 ret;
@ -251,7 +251,7 @@ u32 GetNtpTime()
// サーバから時刻情報を受信する
// サーバを指定して受信を行う
// 受信するまで待たされる
if ((ret = nn::socket::RecvFrom(socket, reinterpret_cast<void*> (&s_NTPRecvPacket), sizeof(s_NTPRecvPacket), 0,
if ((ret = nn::socket::RecvFrom(socket, reinterpret_cast<void*> (&s_NTPRecvPacket), sizeof(s_NTPRecvPacket), nn::socket::MSG_DONTWAIT,
&serverSockAddrIn)) < 0)
{
NN_LOG("Error: RecvFrom, %d\n", ret);
@ -271,7 +271,7 @@ u32 GetNtpTime()
NN_LOG("Finalizing socket..\n");
// ソケットライブラリの終了
result = nn::socket::Finalize();
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
// ソケットライブラリを Finalize すればワーク領域を再利用できます。
delete[] pWorkMemory;
@ -279,7 +279,7 @@ u32 GetNtpTime()
NN_LOG("Finalizing network.\n");
result = FinalizeNetwork();
NN_UTIL_PANIC_IF_FAILED(result);
COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
return ntp_time;
}