diff --git a/src/cli.rs b/src/cli.rs index 49496ed8..51313a35 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -2,6 +2,7 @@ use anyhow::{bail, ensure}; use clap::Parser; use std::path::{Path, PathBuf}; +use crate::app_server; use crate::app_server::AppServer; use crate::util::{LoadValue, LoadValueB64}; use crate::{ @@ -233,7 +234,11 @@ impl Cli { cfg_peer.pre_shared_key.map(SymKey::load_b64).transpose()?, SPk::load(&cfg_peer.public_key)?, cfg_peer.key_out, - None, // TODO remove this argument + cfg_peer.wg.map(|cfg| app_server::WireguardOut { + dev: cfg.device, + pk: cfg.peer, + extra_params: cfg.extra_params, + }), cfg_peer.endpoint.clone(), )?; } diff --git a/src/config.rs b/src/config.rs index 154edab7..c2f7d263 100644 --- a/src/config.rs +++ b/src/config.rs @@ -53,9 +53,9 @@ pub struct RosenpassPeer { #[derive(Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub struct WireGuard { - device: String, - peer: String, - extra_params: Vec, + pub device: String, + pub peer: String, + pub extra_params: Vec, } impl Rosenpass {