Revert misunderstanding and make the JSON a little friendlier

3 files changed, 24 insertions, 15 deletions

diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 1f2b53babc..e4edb30527 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -49,7 +49,8 @@ use jsonrpc_core::futures::sync::oneshot::Sender as OneshotSender;
 use management_interface::{BoxFuture, ManagementInterfaceServer, TunnelCommand};
 use mullvad_rpc::{AccountsProxy, HttpHandle};
 use mullvad_types::account::{AccountData, AccountToken};
-use mullvad_types::relay_constraints::{RelayConstraints, HostConstraint, OpenVpnConstraints, Port,
+use mullvad_types::relay_constraints::{HostConstraint, OpenVpnConstraints, PortConstraint,
+                                       ProtocolConstraint, RelayConstraints,
                                        RelayConstraintsUpdate, TunnelConstraints};
 use mullvad_types::relay_endpoint::RelayEndpoint;
 use mullvad_types::states::{DaemonState, SecurityState, TargetState};
@@ -320,7 +321,7 @@ impl Daemon {
             GetAccount(tx) => Ok(self.on_get_account(tx)),
             UpdateRelayConstraints(tx, constraints_update) => {
                 self.on_update_relay_constraints(tx, constraints_update)
-            },
+            }
             GetRelayConstraints(tx) => Ok(self.on_get_relay_constraints(tx)),
             Shutdown => self.handle_trigger_shutdown_event(),
         }
@@ -403,7 +404,11 @@ impl Daemon {
     }
 
     fn on_get_relay_constraints(&self, tx: OneshotSender<RelayConstraints>) {
-        Self::oneshot_send(tx, self.settings.get_relay_constraints(), "relay constraints")
+        Self::oneshot_send(
+            tx,
+            self.settings.get_relay_constraints(),
+            "relay constraints",
+        )
     }
 
     fn oneshot_send<T>(tx: OneshotSender<T>, t: T, msg: &'static str) {
@@ -526,7 +531,7 @@ impl Daemon {
     fn get_relay(&mut self) -> Result<Endpoint> {
         let relay_constraints = self.settings.get_relay_constraints();
 
-        let host = match relay_constraints.host.unwrap_or(HostConstraint::Any) {
+        let host = match relay_constraints.host {
             HostConstraint::Any => format!("{}", self.relay_iter.next().unwrap().address),
             HostConstraint::Host(host) => host,
         };
@@ -541,11 +546,14 @@ impl Daemon {
         host: String,
         constraints: OpenVpnConstraints,
     ) -> Result<Endpoint> {
-        let protocol = constraints.protocol.unwrap_or(TransportProtocol::Udp);
+        let protocol = match constraints.protocol {
+            ProtocolConstraint::Any => TransportProtocol::Udp,
+            ProtocolConstraint::Protocol(protocol) => protocol,
+        };
 
-        let port = match constraints.port.unwrap_or(Port::Any) {
-            Port::Any => randomize_port(protocol),
-            Port::Port(port) => port,
+        let port = match constraints.port {
+            PortConstraint::Any => randomize_port(protocol),
+            PortConstraint::Port(port) => port,
         };
 
         RelayEndpoint {
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index 952ffbe65e..28b905390d 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -10,6 +10,8 @@ use jsonrpc_ws_server;
 use mullvad_rpc;
 use mullvad_types::account::{AccountData, AccountToken};
 use mullvad_types::location::{CountryCode, Location};
+
+use mullvad_types::relay_constraints::{RelayConstraints, RelayConstraintsUpdate};
 use mullvad_types::states::{DaemonState, TargetState};
 
 use serde;
@@ -19,8 +21,6 @@ use std::collections::hash_map::Entry;
 use std::net::{IpAddr, Ipv4Addr};
 use std::sync::{Arc, Mutex, RwLock};
 use std::sync::atomic::{AtomicBool, Ordering};
-
-use mullvad_types::relay_constraints::{RelayConstraints, RelayConstraintsUpdate};
 use talpid_core::mpsc::IntoSender;
 use talpid_ipc;
 use uuid;
@@ -307,7 +307,7 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterface<T> {
     }
 
     fn check_auth(&self, meta: &Meta) -> Result<(), Error> {
-        if true || meta.authenticated.load(Ordering::SeqCst) {
+        if meta.authenticated.load(Ordering::SeqCst) {
             trace!("auth success");
             Ok(())
         } else {
diff --git a/mullvad-daemon/src/settings.rs b/mullvad-daemon/src/settings.rs
index 280823ca94..d1a852c11d 100644
--- a/mullvad-daemon/src/settings.rs
+++ b/mullvad-daemon/src/settings.rs
@@ -3,7 +3,8 @@ extern crate serde_json;
 
 use self::app_dirs::{AppDataType, AppInfo};
 
-use mullvad_types::relay_constraints::{OpenVpnConstraints, RelayConstraints,
+use mullvad_types::relay_constraints::{HostConstraint, OpenVpnConstraints, PortConstraint,
+                                       ProtocolConstraint, RelayConstraints,
                                        RelayConstraintsUpdate, TunnelConstraints};
 use std::fs::File;
 use std::io;
@@ -51,10 +52,10 @@ impl Default for Settings {
 const DEFAULT_SETTINGS: Settings = Settings {
     account_token: None,
     relay_constraints: RelayConstraints {
-        host: None,
+        host: HostConstraint::Any,
         tunnel: TunnelConstraints::OpenVpn(OpenVpnConstraints {
-            port: None,
-            protocol: None,
+            port: PortConstraint::Any,
+            protocol: ProtocolConstraint::Any,
         }),
     },
 };