Fix unable to test Shadowsocks nodes on Windows

Optimize codes.
nonomal · Oct 7, 2020 · 56f0f23 · 56f0f23
1 parent 3ad87dc
commit 56f0f23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -219,7 +219,7 @@ int runClient(int client)
     std::string ssr_libev_path = "tools\\clients\\ssr-local.exe -u -c config.json";
 
     std::string ss_libev_dir = "tools\\clients\\";
-    std::string ss_libev_path = ss_libev_dir + "ss-local.exe -u -c ..\\..\\..\\config.json";
+    std::string ss_libev_path = ss_libev_dir + "ss-local.exe -u -c ..\\..\\config.json";
 
     std::string ssr_win_dir = "tools\\clients\\";
     std::string ssr_win_path = ssr_win_dir + "shadowsocksr-win.exe";
@@ -379,7 +379,7 @@ int terminateClient(int client)
     return 0;
 }
 
-void readConf(const std::string &path)
+void readConf(std::string path)
 {
     downloadLink link;
     linkMatchRule rule;
@@ -390,7 +390,7 @@ void readConf(const std::string &path)
     std::string strTemp;
 
     //ini.do_utf8_to_gbk = true;
-    ini.ParseFile("pref.ini");
+    ini.ParseFile(path);
 
     ini.EnterSection("common");
     if(ini.ItemPrefixExist("exclude_remark"))

diff --git a/src/socket.cpp b/src/socket.cpp
@@ -273,18 +273,17 @@ std::string hostnameToIPAddr(std::string host)
     int retVal;
     std::string retstr;
     struct addrinfo hint = {}, *retAddrInfo = NULL, *cur;
+    defer(if(retAddrInfo) freeaddrinfo(retAddrInfo));
     retVal = getaddrinfo(host.data(), NULL, &hint, &retAddrInfo);
     if(retVal != 0)
-    {
         return std::string();
-    }
 
     for(cur = retAddrInfo; cur != NULL; cur = cur->ai_next)
     {
-        if((retstr = sockaddrToIPAddr(cur->ai_addr)).size())
+        retstr = sockaddrToIPAddr(cur->ai_addr);
+        if(!retstr.empty())
             break;
     }
-    freeaddrinfo(retAddrInfo);
     return retstr;
 }