diff options
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-management-interface/src/types.rs | 2 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/wireguard/config.rs | 4 | ||||
| -rw-r--r-- | talpid-types/src/net/wireguard.rs | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs index 6d92566bac..37c37a1e15 100644 --- a/mullvad-daemon/src/lib.rs +++ b/mullvad-daemon/src/lib.rs @@ -1094,7 +1094,7 @@ where connection: wireguard::ConnectionConfig { tunnel, peer, - additional_peers: exit_peer.map(|peer| vec![peer]).unwrap_or(vec![]), + exit_peer, ipv4_gateway, ipv6_gateway: Some(ipv6_gateway), }, diff --git a/mullvad-management-interface/src/types.rs b/mullvad-management-interface/src/types.rs index 1309e8bf70..c83857f5ff 100644 --- a/mullvad-management-interface/src/types.rs +++ b/mullvad-management-interface/src/types.rs @@ -776,7 +776,7 @@ impl TryFrom<RelaySettingsUpdate> for mullvad_types::relay_constraints::RelaySet ))? .into(), }, - additional_peers: vec![], + exit_peer: None, ipv4_gateway, ipv6_gateway, }) diff --git a/talpid-core/src/tunnel/wireguard/config.rs b/talpid-core/src/tunnel/wireguard/config.rs index a7b291438e..ae82483c66 100644 --- a/talpid-core/src/tunnel/wireguard/config.rs +++ b/talpid-core/src/tunnel/wireguard/config.rs @@ -48,7 +48,9 @@ impl Config { pub fn from_parameters(params: &wireguard::TunnelParameters) -> Result<Config, Error> { let tunnel = params.connection.tunnel.clone(); let mut peers = vec![params.connection.peer.clone()]; - peers.append(&mut params.connection.additional_peers.clone()); + if let Some(exit_peer) = ¶ms.connection.exit_peer { + peers.push(exit_peer.clone()); + } Self::new( tunnel, peers, diff --git a/talpid-types/src/net/wireguard.rs b/talpid-types/src/net/wireguard.rs index a3cc75c88c..213bac55a1 100644 --- a/talpid-types/src/net/wireguard.rs +++ b/talpid-types/src/net/wireguard.rs @@ -25,7 +25,7 @@ pub struct TunnelParameters { pub struct ConnectionConfig { pub tunnel: TunnelConfig, pub peer: PeerConfig, - pub additional_peers: Vec<PeerConfig>, + pub exit_peer: Option<PeerConfig>, /// Gateway used by the tunnel (a private address). pub ipv4_gateway: Ipv4Addr, pub ipv6_gateway: Option<Ipv6Addr>, |