From d6e1ee67d0fb7eb92e249c5ab89088a8ebcb6540 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=98=95?= <huangxin@cmhi.chinamobile.com>
Date: Thu, 24 Aug 2023 09:47:01 +0800
Subject: [PATCH] =?UTF-8?q?OCT=201.=20=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=E4=B8=BA=E7=9B=B8=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E6=97=B6=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=97=A5=E5=BF=97=E6=96=87=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 NetTunnelSDK/tunnel/tunnel.cpp        | 21 +++++++++++++--------
 TestNetTunnelSDK/TestNetTunnelSDK.cpp |  3 +--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/NetTunnelSDK/tunnel/tunnel.cpp b/NetTunnelSDK/tunnel/tunnel.cpp
index 8bf54b7..918a45b 100644
--- a/NetTunnelSDK/tunnel/tunnel.cpp
+++ b/NetTunnelSDK/tunnel/tunnel.cpp
@@ -50,17 +50,22 @@ static spdlog::level::level_enum logLevelToSpdlogLevel(LOG_LEVEL level) {
 
 static void InitTunnelSDKLog(const TCHAR *pLogFile, LOG_LEVEL level) {
     TCHAR buf[MAX_PATH] = {0};
+    TCHAR tmpPath[MAX_PATH];
 
-    if (pLogFile && strlen(pLogFile) > 0 && !PathIsRelative(pLogFile)) {
-        TCHAR tmpPath[MAX_PATH];
-        StringCbCopy(tmpPath, MAX_PATH, pLogFile);
-        PathRemoveFileSpec(tmpPath);
-        MakeSureDirectoryPathExists(tmpPath);
-        StringCbCopy(buf, MAX_PATH, pLogFile);
+    if (pLogFile && strlen(pLogFile) > 0) {
+        if (PathIsRelative(buf)) {
+            StringCbPrintf(buf, MAX_PATH, TEXT("%s\\%s"), g_globalConfig.workDirectory, pLogFile);
+        } else {
+            StringCbCopy(buf, MAX_PATH, pLogFile);
+        }
     } else {
         StringCbPrintf(buf, MAX_PATH, TEXT("%s\\tunnelsdklog.log"), g_globalConfig.workDirectory);
     }
 
+    StringCbCopy(tmpPath, MAX_PATH, buf);
+    PathRemoveFileSpec(tmpPath);
+    MakeSureDirectoryPathExists(tmpPath);
+
     g_globalConfig.enableLog = TRUE;
     g_globalConfig.logLevel  = logLevelToSpdlogLevel(level);
 
@@ -144,7 +149,7 @@ int TunnelSDKInitEnv(const TCHAR *pWorkDir,
 
     StringCbCat(g_globalConfig.configDirectory, MAX_PATH, "\\NetTunnel");
     SPDLOG_DEBUG(TEXT("Configure directory: {0}."), g_globalConfig.configDirectory);
-    SPDLOG_DEBUG(TEXT("Platform Server: {}, Work Module: {}"), pSvrUrl, isWorkServer? TEXT("SERVER") : TEXT("Client"));
+    SPDLOG_DEBUG(TEXT("Platform Server: {}, Work Module: {}"), pSvrUrl, isWorkServer ? TEXT("SERVER") : TEXT("Client"));
 
     // 如果配置目录不存在则自动创建
     if (!PathFileExists(g_globalConfig.configDirectory)) {
@@ -173,7 +178,7 @@ int TunnelSDKInitEnv(const TCHAR *pWorkDir,
         return -ERR_ITEM_UNEXISTS;
     }
 #endif
-    
+
     return ERR_SUCCESS;
 }
 
diff --git a/TestNetTunnelSDK/TestNetTunnelSDK.cpp b/TestNetTunnelSDK/TestNetTunnelSDK.cpp
index a8362d3..985d4b2 100644
--- a/TestNetTunnelSDK/TestNetTunnelSDK.cpp
+++ b/TestNetTunnelSDK/TestNetTunnelSDK.cpp
@@ -19,8 +19,7 @@ TEST_MODULE_INITIALIZE(ModuleInitialize) {
     Assert::AreEqual(0,
                      TunnelSDKInitEnv(path,
                                       "http://172.21.40.194:32549",
-                                      TEXT("C:\\Users\\HuangXin\\Documents\\development\\visual_studio\\tunnel_"
-                                           "windows\\NetTunnelApp\\bin\\Debug\\utest.log"),
+                                      TEXT("./test/utest.log"),
                                       LOG_TRACE,
                                       false));
     //Assert::AreEqual(0, EnableVerifySignature(TEXT("123"), TEXT("123456")));