From 61b4e63db0dd1caa3db8df3eff4561218ffb2ac7 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Sun, 21 Jul 2024 09:25:29 +0000 Subject: [PATCH] Continug ripping random code out of the dashboard. --- tst-network/source/main.cpp | 45 ------------------------------------- 1 file changed, 45 deletions(-) diff --git a/tst-network/source/main.cpp b/tst-network/source/main.cpp index 1856bc491..650b246c7 100644 --- a/tst-network/source/main.cpp +++ b/tst-network/source/main.cpp @@ -34,7 +34,6 @@ #include #include "baton.hpp" -#include "boring.hpp" #include "client0.hpp" #include "client1.hpp" #include "crypto.hpp" @@ -53,7 +52,6 @@ #include "sleep.hpp" #include "store.hpp" #include "time.hpp" -#include "transport.hpp" #include "updater.hpp" #include "version.hpp" @@ -107,28 +105,6 @@ task Version(Base &base, const Locator &url) { try { co_return version; } orc_catch({ co_return ""; }) } -task TestOpenVPN(const S &base, std::string ovpn) { - (co_await orc_optic)->Name("OpenVPN"); - co_return co_await Using>([&](BufferSink &remote) -> task { - co_await Connect(remote, base, remote.Host().operator uint32_t(), std::move(ovpn), "", ""); - remote.Open(); - const auto [speed, size] = co_await Measure(remote); - const auto host(co_await Find(remote)); - co_return Report{{}, std::nullopt, speed, host, {}, ""}; - }); -} - -task TestWireGuard(const S &base, std::string config) { - (co_await orc_optic)->Name("WireGuard"); - co_return co_await Using>([&](BufferSink &remote) -> task { - co_await Guard(remote, base, remote.Host().operator uint32_t(), std::move(config)); - remote.Open(); - const auto host(co_await Find(remote)); - const auto [speed, size] = co_await Measure(remote); - co_return Report{{}, std::nullopt, speed, host, {}, ""}; - }); -} - task TestOrchid(const S &base, std::string name, const S &network, const char *address, std::function (BufferSink &)> code) { (co_await orc_optic)->Name(address); @@ -222,9 +198,6 @@ auto &At(Type_ &&type, const Value_ &value) { int Main(int argc, const char *const argv[]) { std::vector chains; - std::vector openvpns; - std::vector wireguards; - po::variables_map args; po::options_description group("general command line"); @@ -251,12 +224,6 @@ int Main(int argc, const char *const argv[]) { ("chain", po::value>(&chains), "like 1,ETH,https://cloudflare-eth.com/") ; options.add(group); } - { po::options_description group("protocol testing"); - group.add_options() - ("openvpn", po::value(&openvpns)) - ("wireguard", po::value(&wireguards)) - ; options.add(group); } - po::store(po::parse_command_line(argc, argv, po::options_description() .add(group) .add(options) @@ -272,8 +239,6 @@ int Main(int argc, const char *const argv[]) { return 0; } - Initialize(); - const unsigned milliseconds(60*1000); const S base(Break()); @@ -327,16 +292,6 @@ int Main(int argc, const char *const argv[]) { std::vector names; std::vector> tests; - for (const auto &openvpn : openvpns) { - names.emplace_back("OpenVPN"); - tests.emplace_back(TestOpenVPN(base, Load(openvpn))); - } - - for (const auto &wireguard : wireguards) { - names.emplace_back("WireGuard"); - tests.emplace_back(TestWireGuard(base, Load(wireguard))); - } - for (const auto &[provider, name] : (std::pair[]) { {"0x605c12040426ddCc46B4FEAD4b18a30bEd201bD0", "Bloq"}, {"0xe675657B3fBbe12748C7A130373B55c898E0Ea34", "BolehVPN"},