taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-04 10:42:04 +00:00
Code Issues Projects Releases Wiki Activity

Add host name resolve when adding ShadowsocksR nodes to Surge configs

Browse Source
This commit is contained in:
Tindy X committed 2020-03-20 21:10:26 +08:00
1 parent 0bc341f7ea
commit f496333ce0
2 files changed
+4 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/socket.h
+1 -1
View File
@@ -48,7 +48,7 @@ int setTimeout(SOCKET s, int timeout);
int startConnect(SOCKET sHost, std::string addr, int port); int startConnect(SOCKET sHost, std::string addr, int port);
int simpleSend(std::string addr, int port, std::string data); int simpleSend(std::string addr, int port, std::string data);
int send_simple(SOCKET sHost, std::string data); int send_simple(SOCKET sHost, std::string data);
std::string hostnameToIPAddr(std::string host); std::string hostnameToIPAddr(const std::string &host);
int connectSocks5(SOCKET sHost, std::string username, std::string password); int connectSocks5(SOCKET sHost, std::string username, std::string password);
int connectThruSocks(SOCKET sHost, std::string host, int port); int connectThruSocks(SOCKET sHost, std::string host, int port);
int connectThruHTTP(SOCKET sHost, std::string username, std::string password, std::string dsthost, int dstport); int connectThruHTTP(SOCKET sHost, std::string username, std::string password, std::string dsthost, int dstport);
src/subexport.cpp
+3 -6
View File
@@ -25,8 +25,7 @@ extern string_array ss_ciphers, ssr_ciphers;
string_array clashr_protocols = {"auth_aes128_md5", "auth_aes128_sha1"}; string_array clashr_protocols = {"auth_aes128_md5", "auth_aes128_sha1"};
string_array clashr_obfs = {"plain", "http_simple", "http_post", "tls1.2_ticket_auth"}; string_array clashr_obfs = {"plain", "http_simple", "http_post", "tls1.2_ticket_auth"};
/* std::string hostnameToIPAddr(const std::string &host)
std::string hostnameToIPAddr(std::string host)
{ {
int retVal; int retVal;
std::string retAddr; std::string retAddr;
@@ -60,7 +59,6 @@ std::string hostnameToIPAddr(std::string host)
freeaddrinfo(retAddrInfo); freeaddrinfo(retAddrInfo);
return retAddr; return retAddr;
} }
*/
std::string vmessConstruct(std::string add, std::string port, std::string type, std::string id, std::string aid, std::string net, std::string cipher, std::string path, std::string host, std::string edge, std::string tls, int local_port) std::string vmessConstruct(std::string add, std::string port, std::string type, std::string id, std::string aid, std::string net, std::string cipher, std::string path, std::string host, std::string edge, std::string tls, int local_port)
{ {
@@ -1087,9 +1085,8 @@ std::string netchToSurge(std::vector<nodeInfo> &nodes, std::string &base_conf, s
{ {
return std::move(a) + "\", args=\"" + std::move(b); return std::move(a) + "\", args=\"" + std::move(b);
}); });
//std::string ipaddr = (isIPv4(hostname) || isIPv6(hostname)) ? hostname : hostnameToIPAddr(hostname); proxy += "\", local-port=" + std::to_string(local_port) + ", addresses=" + ((isIPv4(hostname) || isIPv6(hostname)) ? hostname : hostnameToIPAddr(hostname));
//proxy += "\", local-port=" + std::to_string(local_port) + ", addresses=" + ipaddr; //proxy += "\", local-port=" + std::to_string(local_port);
proxy += "\", local-port=" + std::to_string(local_port);
local_port++; local_port++;
break; break;
case SPEEDTEST_MESSAGE_FOUNDSOCKS: case SPEEDTEST_MESSAGE_FOUNDSOCKS: