From 3ad85ed549ab9cc485bd036d4a178531587065cc Mon Sep 17 00:00:00 2001
From: N2614 <N2614@385bec56-5757-e545-9c3a-d8741f4650f1>
Date: Thu, 19 Jan 2012 00:17:29 +0000
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=BC=E3=82=B8=E3=81=95=E3=82=8C?=
 =?UTF-8?q?=E3=81=9F=E3=83=AA=E3=83=93=E3=82=B8=E3=83=A7=E3=83=B3569?=
 =?UTF-8?q?=E3=82=92=20trunk/ConsoleDataMigration/sources/ConsoleRestore/N?=
 =?UTF-8?q?tpClient.cpp=20=E3=81=8B=E3=82=89=E5=8F=96=E3=82=8A=E6=B6=88?=
 =?UTF-8?q?=E3=81=99:=20=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE=E3=83=93?=
 =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=8C=E9=80=9A=E3=82=8B=E3=82=88=E3=81=86?=
 =?UTF-8?q?=E3=81=AB=20........=20=E3=83=86=E3=82=B9=E3=83=88=E3=81=AB?=
 =?UTF-8?q?=E9=96=A2=E4=BF=82=E3=81=AA=E3=81=84=E3=82=B3=E3=83=9F=E3=83=83?=
 =?UTF-8?q?=E3=83=88=E3=81=AE=E3=81=9F=E3=82=81=E5=B7=BB=E3=81=8D=E6=88=BB?=
 =?UTF-8?q?=E3=81=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@570 385bec56-5757-e545-9c3a-d8741f4650f1
---
 .../sources/ConsoleRestore/NtpClient.cpp      | 48 ++++++++++++++++++-
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
index 642ed08..b92040c 100644
--- a/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
+++ b/trunk/ConsoleDataMigration/sources/ConsoleRestore/NtpClient.cpp
@@ -54,6 +54,50 @@ NTP_Packet	s_NTPSendPacket;	// 送信するNTPパケット
 NTP_Packet	s_NTPRecvPacket;	// 受信するNTPパケット
 const u32 NTP_PORT_NUM = 123;
 
+nn::Result InitializeNetwork(void)
+{
+    nn::Result result;
+    nn::ac::Config config;
+
+    result = nn::ac::Initialize();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+
+    // 接続要求用のパラメータを作成
+    result = nn::ac::CreateDefaultConfig(&config);
+    if (result.IsFailure())
+    {
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        return result;
+    }
+
+    // デバッグ用に接続テストを無効化
+    nn::ac::DebugSetNetworkArea(&config, nn::ac::NETWORK_AREA_LAN);
+
+    // 接続要求を発行
+    result = nn::ac::ConnectWithoutEula(config);
+    if (result.IsFailure())
+    {
+        COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+        return result;
+    }
+
+    return nn::ResultSuccess();
+}
+
+nn::Result FinalizeNetwork(void)
+{
+    nn::Result result;
+
+    // 接続要求用のパラメータを作成
+    result = nn::ac::Close();
+    NN_UTIL_RETURN_IF_FAILED(result);
+
+    result = nn::ac::Finalize();
+    COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
+
+    return nn::ResultSuccess();
+}
+
 bool GetNtpTime(u32* ntpTime)
 {
     nn::Result result;
@@ -62,7 +106,7 @@ bool GetNtpTime(u32* ntpTime)
     NN_LOG("Initializing network.\n");
 
     // 本体に書き込まれているネットワーク設定を使ってネットワーク接続を初期化
-    result = common::InitializeNetwork();
+    result = InitializeNetwork();
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     {
@@ -232,7 +276,7 @@ bool GetNtpTime(u32* ntpTime)
     }
 
     NN_LOG("Finalizing network.\n");
-    result = common::FinalizeNetwork();
+    result = FinalizeNetwork();
     COMMON_LOGGER_RESULT_IF_FAILED_WITH_LINE(result);
 
     return retval;