mirror of
https://github.com/asdlokj1qpi233/subconverter.git
synced 2025-12-11 21:52:24 +00:00
merge tindy2013
This commit is contained in:
2
.github/workflows/docker.yml
vendored
2
.github/workflows/docker.yml
vendored
@@ -10,7 +10,7 @@ concurrency:
|
|||||||
cancel-in-progress: true
|
cancel-in-progress: true
|
||||||
|
|
||||||
env:
|
env:
|
||||||
REGISTRY_IMAGE: tindy2013/subconverter
|
REGISTRY_IMAGE: asdlokj1qpi23/subconverter
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -800,7 +800,7 @@ void readConf()
|
|||||||
return readYAMLConf(yaml);
|
return readYAMLConf(yaml);
|
||||||
}
|
}
|
||||||
toml::value conf = parseToml(prefdata, global.prefPath);
|
toml::value conf = parseToml(prefdata, global.prefPath);
|
||||||
if(!conf.is_uninitialized() && toml::find_or<int>(conf, "version", 0))
|
if(!conf.is_empty() && toml::find_or<int>(conf, "version", 0))
|
||||||
return readTOMLConf(conf);
|
return readTOMLConf(conf);
|
||||||
}
|
}
|
||||||
catch (YAML::Exception &e)
|
catch (YAML::Exception &e)
|
||||||
@@ -1209,7 +1209,7 @@ int loadExternalConfig(std::string &path, ExternalConfig &ext)
|
|||||||
if(yaml.size() && yaml["custom"].IsDefined())
|
if(yaml.size() && yaml["custom"].IsDefined())
|
||||||
return loadExternalYAML(yaml, ext);
|
return loadExternalYAML(yaml, ext);
|
||||||
toml::value conf = parseToml(base_content, path);
|
toml::value conf = parseToml(base_content, path);
|
||||||
if(!conf.is_uninitialized() && toml::find_or<int>(conf, "version", 0))
|
if(!conf.is_empty() && toml::find_or<int>(conf, "version", 0))
|
||||||
return loadExternalTOML(conf, ext);
|
return loadExternalTOML(conf, ext);
|
||||||
}
|
}
|
||||||
catch (YAML::Exception &e)
|
catch (YAML::Exception &e)
|
||||||
|
|||||||
@@ -101,12 +101,12 @@ extern Settings global;
|
|||||||
|
|
||||||
int importItems(string_array &target, bool scope_limit = true);
|
int importItems(string_array &target, bool scope_limit = true);
|
||||||
int loadExternalConfig(std::string &path, ExternalConfig &ext);
|
int loadExternalConfig(std::string &path, ExternalConfig &ext);
|
||||||
template <class T, class... U>
|
//template <class T, class... U>
|
||||||
void find_if_exist(const toml::value &v, const toml::key &k, T& target, U&&... args)
|
//void find_if_exist(const toml::value &v, const toml::key &k, T& target, U&&... args)
|
||||||
{
|
//{
|
||||||
if(v.contains(k)) target = toml::find<T>(v, k);
|
// if(v.contains(k)) target = toml::find<T>(v, k);
|
||||||
if constexpr (sizeof...(args) > 0) find_if_exist(v, std::forward<U>(args)...);
|
// if constexpr (sizeof...(args) > 0) find_if_exist(v, std::forward<U>(args)...);
|
||||||
}
|
//}
|
||||||
template <class... Args>
|
template <class... Args>
|
||||||
void parseGroupTimes(const std::string &src, Args... args)
|
void parseGroupTimes(const std::string &src, Args... args)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -127,10 +127,14 @@ struct Proxy {
|
|||||||
String Flow;
|
String Flow;
|
||||||
bool FlowShow = false;
|
bool FlowShow = false;
|
||||||
tribool DisableSni;
|
tribool DisableSni;
|
||||||
|
uint32_t UpSpeed;
|
||||||
|
uint32_t DownSpeed;
|
||||||
|
String SNI;
|
||||||
tribool ReduceRtt;
|
tribool ReduceRtt;
|
||||||
String UdpRelayMode = "native";
|
String UdpRelayMode = "native";
|
||||||
uint16_t RequestTimeout = 15000;
|
uint16_t RequestTimeout = 15000;
|
||||||
String token;
|
String token;
|
||||||
|
String UnderlyingProxy;
|
||||||
std::vector<String> AlpnList;
|
std::vector<String> AlpnList;
|
||||||
String PacketEncoding;
|
String PacketEncoding;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ std::string modSSMD5 = "f7653207090ce3389115e9c88541afe0";
|
|||||||
|
|
||||||
void commonConstruct(Proxy &node, ProxyType type, const std::string &group, const std::string &remarks,
|
void commonConstruct(Proxy &node, ProxyType type, const std::string &group, const std::string &remarks,
|
||||||
const std::string &server, const std::string &port, const tribool &udp, const tribool &tfo,
|
const std::string &server, const std::string &port, const tribool &udp, const tribool &tfo,
|
||||||
const tribool &scv, const tribool &tls13) {
|
const tribool &scv, const tribool &tls13,const std::string& underlying_proxy) {
|
||||||
node.Type = type;
|
node.Type = type;
|
||||||
node.Group = group;
|
node.Group = group;
|
||||||
node.Remark = remarks;
|
node.Remark = remarks;
|
||||||
@@ -46,6 +46,7 @@ void commonConstruct(Proxy &node, ProxyType type, const std::string &group, cons
|
|||||||
node.TCPFastOpen = tfo;
|
node.TCPFastOpen = tfo;
|
||||||
node.AllowInsecure = scv;
|
node.AllowInsecure = scv;
|
||||||
node.TLS13 = tls13;
|
node.TLS13 = tls13;
|
||||||
|
node.UnderlyingProxy = underlying_proxy;
|
||||||
}
|
}
|
||||||
|
|
||||||
void vmessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
void vmessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
||||||
@@ -53,8 +54,8 @@ void vmessConstruct(Proxy &node, const std::string &group, const std::string &re
|
|||||||
const std::string &net, const std::string &cipher, const std::string &path, const std::string &host,
|
const std::string &net, const std::string &cipher, const std::string &path, const std::string &host,
|
||||||
const std::string &edge, const std::string &tls, const std::string &sni,
|
const std::string &edge, const std::string &tls, const std::string &sni,
|
||||||
const std::vector<std::string> &alpnList, tribool udp, tribool tfo,
|
const std::vector<std::string> &alpnList, tribool udp, tribool tfo,
|
||||||
tribool scv, tribool tls13) {
|
tribool scv, tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::VMess, group, remarks, add, port, udp, tfo, scv, tls13);
|
commonConstruct(node, ProxyType::VMess, group, remarks, add, port, udp, tfo, scv, tls13,underlying_proxy);
|
||||||
node.UserId = id.empty() ? "00000000-0000-0000-0000-000000000000" : id;
|
node.UserId = id.empty() ? "00000000-0000-0000-0000-000000000000" : id;
|
||||||
node.AlterId = to_int(aid);
|
node.AlterId = to_int(aid);
|
||||||
node.EncryptMethod = cipher;
|
node.EncryptMethod = cipher;
|
||||||
@@ -76,8 +77,8 @@ void vmessConstruct(Proxy &node, const std::string &group, const std::string &re
|
|||||||
void ssrConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void ssrConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &protocol, const std::string &method,
|
const std::string &port, const std::string &protocol, const std::string &method,
|
||||||
const std::string &obfs, const std::string &password, const std::string &obfsparam,
|
const std::string &obfs, const std::string &password, const std::string &obfsparam,
|
||||||
const std::string &protoparam, tribool udp, tribool tfo, tribool scv) {
|
const std::string &protoparam, tribool udp, tribool tfo, tribool scv,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::ShadowsocksR, group, remarks, server, port, udp, tfo, scv, tribool());
|
commonConstruct(node, ProxyType::ShadowsocksR, group, remarks, server, port, udp, tfo, scv, tribool(),underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.EncryptMethod = method;
|
node.EncryptMethod = method;
|
||||||
node.Protocol = protocol;
|
node.Protocol = protocol;
|
||||||
@@ -89,8 +90,8 @@ void ssrConstruct(Proxy &node, const std::string &group, const std::string &rema
|
|||||||
void ssConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void ssConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &password, const std::string &method,
|
const std::string &port, const std::string &password, const std::string &method,
|
||||||
const std::string &plugin, const std::string &pluginopts, tribool udp, tribool tfo, tribool scv,
|
const std::string &plugin, const std::string &pluginopts, tribool udp, tribool tfo, tribool scv,
|
||||||
tribool tls13) {
|
tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::Shadowsocks, group, remarks, server, port, udp, tfo, scv, tls13);
|
commonConstruct(node, ProxyType::Shadowsocks, group, remarks, server, port, udp, tfo, scv, tls13,underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.EncryptMethod = method;
|
node.EncryptMethod = method;
|
||||||
node.Plugin = plugin;
|
node.Plugin = plugin;
|
||||||
@@ -99,17 +100,17 @@ void ssConstruct(Proxy &node, const std::string &group, const std::string &remar
|
|||||||
|
|
||||||
void socksConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void socksConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &username, const std::string &password, tribool udp,
|
const std::string &port, const std::string &username, const std::string &password, tribool udp,
|
||||||
tribool tfo, tribool scv) {
|
tribool tfo, tribool scv,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::SOCKS5, group, remarks, server, port, udp, tfo, scv, tribool());
|
commonConstruct(node, ProxyType::SOCKS5, group, remarks, server, port, udp, tfo, scv, tribool(),underlying_proxy);
|
||||||
node.Username = username;
|
node.Username = username;
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
}
|
}
|
||||||
|
|
||||||
void httpConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void httpConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &username, const std::string &password, bool tls,
|
const std::string &port, const std::string &username, const std::string &password, bool tls,
|
||||||
tribool tfo, tribool scv, tribool tls13) {
|
tribool tfo, tribool scv, tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, tls ? ProxyType::HTTPS : ProxyType::HTTP, group, remarks, server, port, tribool(), tfo, scv,
|
commonConstruct(node, tls ? ProxyType::HTTPS : ProxyType::HTTP, group, remarks, server, port, tribool(), tfo, scv,
|
||||||
tls13);
|
tls13,underlying_proxy);
|
||||||
node.Username = username;
|
node.Username = username;
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.TLSSecure = tls;
|
node.TLSSecure = tls;
|
||||||
@@ -121,8 +122,8 @@ void trojanConstruct(Proxy &node, const std::string &group, const std::string &r
|
|||||||
const std::vector<std::string> &alpnList,
|
const std::vector<std::string> &alpnList,
|
||||||
bool tlssecure,
|
bool tlssecure,
|
||||||
tribool udp, tribool tfo,
|
tribool udp, tribool tfo,
|
||||||
tribool scv, tribool tls13) {
|
tribool scv, tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::Trojan, group, remarks, server, port, udp, tfo, scv, tls13);
|
commonConstruct(node, ProxyType::Trojan, group, remarks, server, port, udp, tfo, scv, tls13,underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.Host = host;
|
node.Host = host;
|
||||||
node.TLSSecure = tlssecure;
|
node.TLSSecure = tlssecure;
|
||||||
@@ -135,8 +136,8 @@ void trojanConstruct(Proxy &node, const std::string &group, const std::string &r
|
|||||||
|
|
||||||
void snellConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void snellConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &password, const std::string &obfs,
|
const std::string &port, const std::string &password, const std::string &obfs,
|
||||||
const std::string &host, uint16_t version, tribool udp, tribool tfo, tribool scv) {
|
const std::string &host, uint16_t version, tribool udp, tribool tfo, tribool scv,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::Snell, group, remarks, server, port, udp, tfo, scv, tribool());
|
commonConstruct(node, ProxyType::Snell, group, remarks, server, port, udp, tfo, scv, tribool(),underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.OBFS = obfs;
|
node.OBFS = obfs;
|
||||||
node.Host = host;
|
node.Host = host;
|
||||||
@@ -147,8 +148,8 @@ void wireguardConstruct(Proxy &node, const std::string &group, const std::string
|
|||||||
const std::string &port, const std::string &selfIp, const std::string &selfIpv6,
|
const std::string &port, const std::string &selfIp, const std::string &selfIpv6,
|
||||||
const std::string &privKey, const std::string &pubKey, const std::string &psk,
|
const std::string &privKey, const std::string &pubKey, const std::string &psk,
|
||||||
const string_array &dns, const std::string &mtu, const std::string &keepalive,
|
const string_array &dns, const std::string &mtu, const std::string &keepalive,
|
||||||
const std::string &testUrl, const std::string &clientId, const tribool &udp) {
|
const std::string &testUrl, const std::string &clientId, const tribool &udp,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::WireGuard, group, remarks, server, port, udp, tribool(), tribool(), tribool());
|
commonConstruct(node, ProxyType::WireGuard, group, remarks, server, port, udp, tribool(), tribool(), tribool(),underlying_proxy);
|
||||||
node.SelfIP = selfIp;
|
node.SelfIP = selfIp;
|
||||||
node.SelfIPv6 = selfIpv6;
|
node.SelfIPv6 = selfIpv6;
|
||||||
node.PrivateKey = privKey;
|
node.PrivateKey = privKey;
|
||||||
@@ -168,8 +169,8 @@ void hysteriaConstruct(Proxy &node, const std::string &group, const std::string
|
|||||||
const std::string &obfsParam, const std::string &insecure, const std::string &ports,
|
const std::string &obfsParam, const std::string &insecure, const std::string &ports,
|
||||||
const std::string &sni, tribool udp,
|
const std::string &sni, tribool udp,
|
||||||
tribool tfo, tribool scv,
|
tribool tfo, tribool scv,
|
||||||
tribool tls13) {
|
tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::Hysteria, group, remarks, add, port, udp, tfo, scv, tls13);
|
commonConstruct(node, ProxyType::Hysteria, group, remarks, add, port, udp, tfo, scv, tls13,underlying_proxy);
|
||||||
node.Auth = auth;
|
node.Auth = auth;
|
||||||
node.Host = (host.empty() && !isIPv4(add) && !isIPv6(add)) ? add.data() : trim(host);
|
node.Host = (host.empty() && !isIPv4(add) && !isIPv6(add)) ? add.data() : trim(host);
|
||||||
node.UpMbps = up;
|
node.UpMbps = up;
|
||||||
@@ -191,8 +192,8 @@ void vlessConstruct(Proxy &node, const std::string &group, const std::string &re
|
|||||||
const std::string &pbk, const std::string &sid, const std::string &fp, const std::string &sni,
|
const std::string &pbk, const std::string &sid, const std::string &fp, const std::string &sni,
|
||||||
const std::vector<std::string> &alpnList,const std::string &packet_encoding,
|
const std::vector<std::string> &alpnList,const std::string &packet_encoding,
|
||||||
tribool udp, tribool tfo,
|
tribool udp, tribool tfo,
|
||||||
tribool scv, tribool tls13) {
|
tribool scv, tribool tls13,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::VLESS, group, remarks, add, port, udp, tfo, scv, tls13);
|
commonConstruct(node, ProxyType::VLESS, group, remarks, add, port, udp, tfo, scv, tls13,underlying_proxy);
|
||||||
node.UserId = id.empty() ? "00000000-0000-0000-0000-000000000000" : id;
|
node.UserId = id.empty() ? "00000000-0000-0000-0000-000000000000" : id;
|
||||||
node.AlterId = to_int(aid);
|
node.AlterId = to_int(aid);
|
||||||
node.EncryptMethod = cipher;
|
node.EncryptMethod = cipher;
|
||||||
@@ -231,8 +232,8 @@ void hysteria2Construct(Proxy &node, const std::string &group, const std::string
|
|||||||
const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
|
const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
|
||||||
const std::string &publicKey, const std::string &ports,
|
const std::string &publicKey, const std::string &ports,
|
||||||
tribool udp, tribool tfo,
|
tribool udp, tribool tfo,
|
||||||
tribool scv) {
|
tribool scv,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::Hysteria2, group, remarks, add, port, udp, tfo, scv, tribool());
|
commonConstruct(node, ProxyType::Hysteria2, group, remarks, add, port, udp, tfo, scv, tribool(),underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.Host = (host.empty() && !isIPv4(add) && !isIPv6(add)) ? add.data() : trim(host);
|
node.Host = (host.empty() && !isIPv4(add) && !isIPv6(add)) ? add.data() : trim(host);
|
||||||
node.UpMbps = up;
|
node.UpMbps = up;
|
||||||
@@ -251,8 +252,8 @@ void tuicConstruct(Proxy &node, const std::string &group, const std::string &rem
|
|||||||
const std::string &sni, const std::string &uuid, const std::string &udpRelayMode,
|
const std::string &sni, const std::string &uuid, const std::string &udpRelayMode,
|
||||||
const std::string &token,
|
const std::string &token,
|
||||||
tribool udp, tribool tfo,
|
tribool udp, tribool tfo,
|
||||||
tribool scv, tribool reduceRtt, tribool disableSni, uint16_t request_timeout) {
|
tribool scv, tribool reduceRtt, tribool disableSni, uint16_t request_timeout,const std::string& underlying_proxy) {
|
||||||
commonConstruct(node, ProxyType::TUIC, group, remarks, add, port, udp, tfo, scv, tribool());
|
commonConstruct(node, ProxyType::TUIC, group, remarks, add, port, udp, tfo, scv, tribool(),underlying_proxy);
|
||||||
node.Password = password;
|
node.Password = password;
|
||||||
node.Alpn = alpn;
|
node.Alpn = alpn;
|
||||||
node.ServerName = sni;
|
node.ServerName = sni;
|
||||||
@@ -1309,7 +1310,7 @@ void explodeClash(Node yamlnode, std::vector<Proxy> &nodes) {
|
|||||||
singleproxy["ipv6"] >>= ipv6;
|
singleproxy["ipv6"] >>= ipv6;
|
||||||
|
|
||||||
wireguardConstruct(node, group, ps, server, port, ip, ipv6, private_key, public_key, password,
|
wireguardConstruct(node, group, ps, server, port, ip, ipv6, private_key, public_key, password,
|
||||||
dns_server, mtu, "0", "", "", udp);
|
dns_server, mtu, "0", "", "", udp,"");
|
||||||
break;
|
break;
|
||||||
case "vless"_hash:
|
case "vless"_hash:
|
||||||
group = XRAY_DEFAULT_GROUP;
|
group = XRAY_DEFAULT_GROUP;
|
||||||
@@ -2160,7 +2161,7 @@ bool explodeSurge(std::string surge, std::vector<Proxy> &nodes) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
wireguardConstruct(node, WG_DEFAULT_GROUP, remarks, "", "0", ip, ipv6, private_key, "", "", dns_servers,
|
wireguardConstruct(node, WG_DEFAULT_GROUP, remarks, "", "0", ip, ipv6, private_key, "", "", dns_servers,
|
||||||
mtu, keepalive, test_url, "", udp);
|
mtu, keepalive, test_url, "", udp,"");
|
||||||
parsePeers(node, peer);
|
parsePeers(node, peer);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
@@ -2823,7 +2824,7 @@ void explodeSingbox(rapidjson::Value &outbounds, std::vector<Proxy> &nodes) {
|
|||||||
password = GetMember(singboxNode, "pre_shared_key");
|
password = GetMember(singboxNode, "pre_shared_key");
|
||||||
dns_server = {"8.8.8.8"};
|
dns_server = {"8.8.8.8"};
|
||||||
wireguardConstruct(node, group, ps, server, port, ip, ipv6, private_key, public_key, password,
|
wireguardConstruct(node, group, ps, server, port, ip, ipv6, private_key, public_key, password,
|
||||||
dns_server, mtu, "0", "", "", udp);
|
dns_server, mtu, "0", "", "", udp,"");
|
||||||
break;
|
break;
|
||||||
case "socks"_hash:
|
case "socks"_hash:
|
||||||
group = SOCKS_DEFAULT_GROUP;
|
group = SOCKS_DEFAULT_GROUP;
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ void hysteriaConstruct(Proxy &node, const std::string &group, const std::string
|
|||||||
const std::string &down, const std::string &alpn, const std::string &obfsParam,
|
const std::string &down, const std::string &alpn, const std::string &obfsParam,
|
||||||
const std::string &insecure, const std::string &ports, const std::string &sni,
|
const std::string &insecure, const std::string &ports, const std::string &sni,
|
||||||
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
||||||
tribool tls13 = tribool());
|
tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void hysteria2Construct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
void hysteria2Construct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
||||||
const std::string &port, const std::string &password, const std::string &host,
|
const std::string &port, const std::string &password, const std::string &host,
|
||||||
@@ -33,7 +33,7 @@ void hysteria2Construct(Proxy &node, const std::string &group, const std::string
|
|||||||
const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
|
const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
|
||||||
const std::string &publicKey, const std::string &ports,
|
const std::string &publicKey, const std::string &ports,
|
||||||
tribool udp, tribool tfo,
|
tribool udp, tribool tfo,
|
||||||
tribool scv);
|
tribool scv,const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void vlessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
void vlessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
||||||
const std::string &port, const std::string &type, const std::string &id, const std::string &aid,
|
const std::string &port, const std::string &type, const std::string &id, const std::string &aid,
|
||||||
@@ -42,45 +42,45 @@ void vlessConstruct(Proxy &node, const std::string &group, const std::string &re
|
|||||||
const std::string &pkd, const std::string &sid, const std::string &fp, const std::string &sni,
|
const std::string &pkd, const std::string &sid, const std::string &fp, const std::string &sni,
|
||||||
const std::vector<std::string> &alpnList,const std::string &packet_encoding,
|
const std::vector<std::string> &alpnList,const std::string &packet_encoding,
|
||||||
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
||||||
tribool tls13 = tribool());
|
tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void vmessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
void vmessConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
||||||
const std::string &port, const std::string &type, const std::string &id, const std::string &aid,
|
const std::string &port, const std::string &type, const std::string &id, const std::string &aid,
|
||||||
const std::string &net, const std::string &cipher, const std::string &path, const std::string &host,
|
const std::string &net, const std::string &cipher, const std::string &path, const std::string &host,
|
||||||
const std::string &edge, const std::string &tls, const std::string &sni,
|
const std::string &edge, const std::string &tls, const std::string &sni,
|
||||||
const std::vector<std::string> &alpnList, tribool udp = tribool(),
|
const std::vector<std::string> &alpnList, tribool udp = tribool(),
|
||||||
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool());
|
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void ssrConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void ssrConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &protocol, const std::string &method,
|
const std::string &port, const std::string &protocol, const std::string &method,
|
||||||
const std::string &obfs, const std::string &password, const std::string &obfsparam,
|
const std::string &obfs, const std::string &password, const std::string &obfsparam,
|
||||||
const std::string &protoparam, tribool udp = tribool(), tribool tfo = tribool(),
|
const std::string &protoparam, tribool udp = tribool(), tribool tfo = tribool(),
|
||||||
tribool scv = tribool());
|
tribool scv = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void ssConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void ssConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &password, const std::string &method,
|
const std::string &port, const std::string &password, const std::string &method,
|
||||||
const std::string &plugin, const std::string &pluginopts, tribool udp = tribool(),
|
const std::string &plugin, const std::string &pluginopts, tribool udp = tribool(),
|
||||||
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool());
|
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void socksConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void socksConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &username, const std::string &password,
|
const std::string &port, const std::string &username, const std::string &password,
|
||||||
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool());
|
tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void httpConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void httpConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &username, const std::string &password, bool tls,
|
const std::string &port, const std::string &username, const std::string &password, bool tls,
|
||||||
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool());
|
tribool tfo = tribool(), tribool scv = tribool(), tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void trojanConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void trojanConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &password, const std::string &network,
|
const std::string &port, const std::string &password, const std::string &network,
|
||||||
const std::string &host, const std::string &path, const std::string &fp, const std::string &sni,
|
const std::string &host, const std::string &path, const std::string &fp, const std::string &sni,
|
||||||
const std::vector<std::string> &alpnList,
|
const std::vector<std::string> &alpnList,
|
||||||
bool tlssecure, tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
bool tlssecure, tribool udp = tribool(), tribool tfo = tribool(), tribool scv = tribool(),
|
||||||
tribool tls13 = tribool());
|
tribool tls13 = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void snellConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
void snellConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &server,
|
||||||
const std::string &port, const std::string &password, const std::string &obfs,
|
const std::string &port, const std::string &password, const std::string &obfs,
|
||||||
const std::string &host, uint16_t version = 0, tribool udp = tribool(), tribool tfo = tribool(),
|
const std::string &host, uint16_t version = 0, tribool udp = tribool(), tribool tfo = tribool(),
|
||||||
tribool scv = tribool());
|
tribool scv = tribool(),const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void tuicConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
void tuicConstruct(Proxy &node, const std::string &group, const std::string &remarks, const std::string &add,
|
||||||
const std::string &port, const std::string &password, const std::string &congestion_control,
|
const std::string &port, const std::string &password, const std::string &congestion_control,
|
||||||
@@ -89,7 +89,7 @@ void tuicConstruct(Proxy &node, const std::string &group, const std::string &rem
|
|||||||
const std::string &token,
|
const std::string &token,
|
||||||
tribool udp = tribool(), tribool tfo = tribool(),
|
tribool udp = tribool(), tribool tfo = tribool(),
|
||||||
tribool scv = tribool(), tribool reduceRtt = tribool(), tribool disableSni = tribool(),
|
tribool scv = tribool(), tribool reduceRtt = tribool(), tribool disableSni = tribool(),
|
||||||
uint16_t request_timeout = 15000);
|
uint16_t request_timeout = 15000,const std::string& underlying_proxy="");
|
||||||
|
|
||||||
void explodeVmess(std::string vmess, Proxy &node);
|
void explodeVmess(std::string vmess, Proxy &node);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user