diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2017-11-14 06:04:44 +0100 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2017-11-14 06:10:44 +0100 |
| commit | e9a97fd69fac26010741ae67066b1ea1b9d9eff6 (patch) | |
| tree | 7fa133b9871144fb1db0f45ef441b2bbfce071cd | |
| parent | 8ffc579063547e028dbcffb12007716d1a490de8 (diff) | |
| download | mullvadvpn-e9a97fd69fac26010741ae67066b1ea1b9d9eff6.tar.xz mullvadvpn-e9a97fd69fac26010741ae67066b1ea1b9d9eff6.zip | |
Adapt get_openvpn_relay to new TunnelEndpoint
| -rw-r--r-- | mullvad-daemon/src/main.rs | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index a5ea07cabd..4ab2ca911c 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -66,7 +66,8 @@ use std::time::{Duration, Instant}; use talpid_core::firewall::{Firewall, FirewallProxy, SecurityPolicy}; use talpid_core::mpsc::IntoSender; use talpid_core::tunnel::{self, TunnelEvent, TunnelMetadata, TunnelMonitor}; -use talpid_types::net::{Endpoint, TransportProtocol, TunnelEndpoint}; +use talpid_types::net::{Endpoint, TransportProtocol, TunnelEndpoint, TunnelEndpointData, + OpenVpnEndpoint}; error_chain!{ errors { @@ -564,7 +565,13 @@ impl Daemon { protocol, }.to_endpoint() .chain_err(|| "Unable to construct a valid relay")?; - Ok(TunnelEndpoint::OpenVpn(endpoint)) + Ok(TunnelEndpoint { + address: endpoint.address.ip(), + tunnel: TunnelEndpointData::OpenVpn(OpenVpnEndpoint { + port, + protocol, + }) + }) } fn spawn_tunnel_monitor( |
