diff options
| -rw-r--r-- | mullvad-daemon/src/main.rs | 6 | ||||
| -rw-r--r-- | talpid-core/src/tunnel/mod.rs | 6 | ||||
| -rw-r--r-- | talpid-types/src/net.rs | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index 84abd0b229..d4de632817 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -66,8 +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, OpenVpnEndpoint, TransportProtocol, TunnelEndpoint, - TunnelEndpointData}; +use talpid_types::net::{Endpoint, OpenVpnParameters, TransportProtocol, TunnelEndpoint, + TunnelParameters}; error_chain!{ errors { @@ -569,7 +569,7 @@ impl Daemon { .chain_err(|| "Unable to construct a valid relay")?; Ok(TunnelEndpoint { address: endpoint.address.ip(), - tunnel: TunnelEndpointData::OpenVpn(OpenVpnEndpoint { port, protocol }), + tunnel: TunnelParameters::OpenVpn(OpenVpnParameters { port, protocol }), }) } diff --git a/talpid-core/src/tunnel/mod.rs b/talpid-core/src/tunnel/mod.rs index 68846402c2..f5c3618352 100644 --- a/talpid-core/src/tunnel/mod.rs +++ b/talpid-core/src/tunnel/mod.rs @@ -11,7 +11,7 @@ use std::io::{self, Write}; use std::net::Ipv4Addr; use std::path::{Path, PathBuf}; -use talpid_types::net::{Endpoint, TunnelEndpoint, TunnelEndpointData}; +use talpid_types::net::{Endpoint, TunnelEndpoint, TunnelParameters}; /// A module for all OpenVPN related tunnel management. pub mod openvpn; @@ -121,8 +121,8 @@ impl TunnelMonitor { L: Fn(TunnelEvent) + Send + Sync + 'static, { match tunnel_endpoint.tunnel { - TunnelEndpointData::OpenVpn(_) => (), - TunnelEndpointData::Wireguard(_) => bail!(ErrorKind::UnsupportedTunnelProtocol), + TunnelParameters::OpenVpn(_) => (), + TunnelParameters::Wireguard(_) => bail!(ErrorKind::UnsupportedTunnelProtocol), } let user_pass_file = Self::create_user_pass_file(account_token) .chain_err(|| ErrorKind::CredentialsWriteError)?; diff --git a/talpid-types/src/net.rs b/talpid-types/src/net.rs index 93238211fc..e74d98f0d9 100644 --- a/talpid-types/src/net.rs +++ b/talpid-types/src/net.rs @@ -7,7 +7,7 @@ use std::str::FromStr; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub struct TunnelEndpoint { pub address: IpAddr, - pub tunnel: TunnelEndpointData, + pub tunnel: TunnelParameters, } impl TunnelEndpoint { @@ -22,37 +22,37 @@ impl TunnelEndpoint { } #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, Deserialize, Serialize)] -pub enum TunnelEndpointData { +pub enum TunnelParameters { /// An OpenVPN tunnel endpoint. - OpenVpn(OpenVpnEndpoint), + OpenVpn(OpenVpnParameters), /// A Wireguard tunnel endpoint. - Wireguard(WireguardEndpoint), + Wireguard(WireguardParameters), } -impl TunnelEndpointData { +impl TunnelParameters { pub fn port(&self) -> u16 { match *self { - TunnelEndpointData::OpenVpn(metadata) => metadata.port, - TunnelEndpointData::Wireguard(metadata) => metadata.port, + TunnelParameters::OpenVpn(metadata) => metadata.port, + TunnelParameters::Wireguard(metadata) => metadata.port, } } pub fn transport_protocol(&self) -> TransportProtocol { match *self { - TunnelEndpointData::OpenVpn(metadata) => metadata.protocol, - TunnelEndpointData::Wireguard(_) => TransportProtocol::Udp, + TunnelParameters::OpenVpn(metadata) => metadata.protocol, + TunnelParameters::Wireguard(_) => TransportProtocol::Udp, } } } #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Deserialize, Serialize)] -pub struct OpenVpnEndpoint { +pub struct OpenVpnParameters { pub port: u16, pub protocol: TransportProtocol, } #[derive(Debug, Copy, Clone, Eq, PartialEq, Hash, Deserialize, Serialize)] -pub struct WireguardEndpoint { +pub struct WireguardParameters { pub port: u16, } |