summaryrefslogtreecommitdiffhomepage
path: root/mullvad-setup/src
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2022-02-28 17:59:49 +0100
committerDavid Lönnhager <david.l@mullvad.net>2022-03-01 15:30:23 +0100
commitd2bdcd5878ae6ea748e10fe8e430b80548ec2fb5 (patch)
tree47690c0d69b5793eaf0348faaa4440fe92abf84e /mullvad-setup/src
parentbcf3278eeb1b63f2ff8fa6ee68ab4cc8bb8b76fd (diff)
downloadmullvadvpn-d2bdcd5878ae6ea748e10fe8e430b80548ec2fb5.tar.xz
mullvadvpn-d2bdcd5878ae6ea748e10fe8e430b80548ec2fb5.zip
Add proxy config generator to daemon
Diffstat (limited to 'mullvad-setup/src')
-rw-r--r--mullvad-setup/src/main.rs16
1 files changed, 12 insertions, 4 deletions
diff --git a/mullvad-setup/src/main.rs b/mullvad-setup/src/main.rs
index 36e1004742..e65b1278f8 100644
--- a/mullvad-setup/src/main.rs
+++ b/mullvad-setup/src/main.rs
@@ -1,6 +1,6 @@
use clap::{crate_authors, crate_description, crate_name, App};
use mullvad_management_interface::new_rpc_client;
-use mullvad_rpc::MullvadRpcRuntime;
+use mullvad_rpc::{proxy::ApiConnectionMode, MullvadRpcRuntime};
use mullvad_types::version::ParsedAppVersion;
use std::{path::PathBuf, process, time::Duration};
use talpid_core::{
@@ -165,11 +165,19 @@ async fn remove_wireguard_key() -> Result<(), Error> {
if let Some(token) = settings.get_account_token() {
if let Some(wg_data) = settings.get_wireguard() {
- let mut rpc_runtime = MullvadRpcRuntime::with_cache(&cache_path, false)
+ let rpc_runtime = MullvadRpcRuntime::with_cache(&cache_path, false)
.await
.map_err(Error::RpcInitializationError)?;
- let mut key_proxy =
- mullvad_rpc::WireguardKeyProxy::new(rpc_runtime.mullvad_rest_handle());
+ let mut key_proxy = mullvad_rpc::WireguardKeyProxy::new(
+ rpc_runtime
+ .mullvad_rest_handle(
+ ApiConnectionMode::try_from_cache(&cache_path)
+ .await
+ .into_repeat(),
+ |_| async { true },
+ )
+ .await,
+ );
retry_future_n(
move || {
key_proxy.remove_wireguard_key(token.clone(), wg_data.private_key.public_key())