diff --git a/scripts/build.alpine.release.sh b/scripts/build.alpine.release.sh index ed47ee4..64a9689 100644 --- a/scripts/build.alpine.release.sh +++ b/scripts/build.alpine.release.sh @@ -4,8 +4,9 @@ set -xe apk add gcc g++ build-base linux-headers cmake make autoconf automake libtool python2 apk add mbedtls-dev mbedtls-static zlib-dev rapidjson-dev libevent-dev libevent-static zlib-static pcre2-dev -git clone https://github.com/curl/curl --depth=1 +git clone https://github.com/curl/curl cd curl +git checkout curl-7_88_0 cmake -DCURL_USE_MBEDTLS=ON -DHTTP_ONLY=ON -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_USE_LIBSSH2=OFF -DBUILD_CURL_EXE=OFF . > /dev/null make install -j2 > /dev/null cd .. diff --git a/src/generator/config/subexport.cpp b/src/generator/config/subexport.cpp index 890fddd..09b3865 100644 --- a/src/generator/config/subexport.cpp +++ b/src/generator/config/subexport.cpp @@ -235,8 +235,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo singleproxy["type"] = "ss"; singleproxy["cipher"] = x.EncryptMethod; singleproxy["password"] = x.Password; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (std::all_of(x.Password.begin(), x.Password.end(), ::isdigit) && !x.Password.empty()) singleproxy["password"].SetTag("str"); switch (hash_(x.Plugin)) { @@ -266,8 +266,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo singleproxy["tls"] = x.TLSSecure; if (xudp && udp) singleproxy["xudp"] = true; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (!scv.is_undef()) singleproxy["skip-cert-verify"] = scv.get(); if (!x.ServerName.empty()) @@ -321,8 +321,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo singleproxy["auth_str"] = x.Auth; singleproxy["up"] = x.UpMbps; singleproxy["down"] = x.DownMbps; - if (!x.TCPFastOpen.is_undef()) - singleproxy["fast-open"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["fast-open"] = tfo.get(); if (!x.FakeType.empty()) singleproxy["protocol"] = x.FakeType; if (!x.Host.empty()) @@ -340,8 +340,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo singleproxy["type"] = "vless"; singleproxy["uuid"] = x.UserId; singleproxy["tls"] = x.TLSSecure; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (xudp && udp) singleproxy["xudp"] = true; if (!x.Host.empty()) @@ -409,8 +409,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo singleproxy["type"] = "ssr"; singleproxy["cipher"] = x.EncryptMethod == "none" ? "dummy" : x.EncryptMethod; singleproxy["password"] = x.Password; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (std::all_of(x.Password.begin(), x.Password.end(), ::isdigit) && !x.Password.empty()) singleproxy["password"].SetTag("str"); singleproxy["protocol"] = x.Protocol; @@ -452,8 +452,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo case ProxyType::Trojan: singleproxy["type"] = "trojan"; singleproxy["password"] = x.Password; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (!x.Host.empty()) singleproxy["sni"] = x.Host; if (std::all_of(x.Password.begin(), x.Password.end(), ::isdigit) && !x.Password.empty()) @@ -479,8 +479,8 @@ proxyToClash(std::vector &nodes, YAML::Node &yamlnode, const ProxyGroupCo case ProxyType::Snell: singleproxy["type"] = "snell"; singleproxy["psk"] = x.Password; - if (!x.TCPFastOpen.is_undef()) - singleproxy["tfo"] = x.TCPFastOpen.get(); + if (!tfo.is_undef()) + singleproxy["tfo"] = tfo.get(); if (x.SnellVersion != 0) singleproxy["version"] = x.SnellVersion; if (!x.OBFS.empty()) {