taixingyiji/subconverter
1
0 Fork 0
mirror of https://github.com/asdlokj1qpi233/subconverter.git synced 2026-11-05 03:02:06 +00:00
Code Issues Projects Releases Wiki Activity

fix bugs, (#23)

Browse Source
This commit is contained in:
asdlokj1qpi23 committed 2025-04-24 14:55:15 +08:00
1 parent 4e73f5695e
commit b0b04a0130
1 file changed
+8 -9
Download Patch File Download Diff File Expand all files Collapse all files
src/generator/config/subexport.cpp
+8 -9
View File
@@ -1272,9 +1272,9 @@ std::string proxyToSingle(std::vector<Proxy> &nodes, int types, extra_settings &
// fp = getUrlArg(addition, "fp"); // fp = getUrlArg(addition, "fp");
// std::string packet_encoding = getUrlArg(addition, "packet-encoding"); // std::string packet_encoding = getUrlArg(addition, "packet-encoding");
// std::string alpn = getUrlArg(addition, "alpn"); // std::string alpn = getUrlArg(addition, "alpn");
proxyStr = "vless://" + id.empty() proxyStr = "vless://" + (id.empty()
? "00000000-0000-0000-0000-000000000000" ? "00000000-0000-0000-0000-000000000000"
: id + "@" + hostname + ":" + port; : id) + "@" + hostname + ":" + port+"?";
if (!tls.empty()) { if (!tls.empty()) {
proxyStr += "&security=" + tls; proxyStr += "&security=" + tls;
} }
@@ -1282,16 +1282,16 @@ std::string proxyToSingle(std::vector<Proxy> &nodes, int types, extra_settings &
proxyStr += "&flow=" + flow; proxyStr += "&flow=" + flow;
} }
if (!pbk.empty()) { if (!pbk.empty()) {
proxyStr += "&pbk=" + flow; proxyStr += "&pbk=" + pbk;
} }
if (!sid.empty()) { if (!sid.empty()) {
proxyStr += "&sid=" + flow; proxyStr += "&sid=" + sid;
} }
if (!fp.empty()) { if (!fp.empty()) {
proxyStr += "&fp=" + flow; proxyStr += "&fp=" + fp;
} }
if (!packet_encoding.empty()) { if (!packet_encoding.empty()) {
proxyStr += "&packet-encoding=" + flow; proxyStr += "&packet-encoding=" + packet_encoding;
} }
if (!alpns.empty()) { if (!alpns.empty()) {
proxyStr += "&alpn=" + alpns[0]; proxyStr += "&alpn=" + alpns[0];
@@ -1317,7 +1317,7 @@ std::string proxyToSingle(std::vector<Proxy> &nodes, int types, extra_settings &
break; break;
case "quic"_hash: case "quic"_hash:
proxyStr += "&headerType=" + fake_type; proxyStr += "&headerType=" + fake_type;
proxyStr += "&quicSecurity=" + host.empty() ? sni : host; proxyStr += "&quicSecurity=" + (host.empty() ? sni : host);
proxyStr += "&key=" + path; proxyStr += "&key=" + path;
break; break;
default: default:
@@ -1351,8 +1351,7 @@ std::string proxyToSingle(std::vector<Proxy> &nodes, int types, extra_settings &
if (ext.nodelist) if (ext.nodelist)
return allLinks; return allLinks;
else return base64Encode(allLinks);
return base64Encode(allLinks);
} }
std::string proxyToSSSub(std::string base_conf, std::vector<Proxy> &nodes, extra_settings &ext) { std::string proxyToSSSub(std::string base_conf, std::vector<Proxy> &nodes, extra_settings &ext) {