Expose autoconnect option in CLI

3 files changed, 74 insertions, 4 deletions

diff --git a/mullvad-cli/src/cmds/auto_connect.rs b/mullvad-cli/src/cmds/auto_connect.rs
new file mode 100644
index 0000000000..57c125c4b6
--- /dev/null
+++ b/mullvad-cli/src/cmds/auto_connect.rs
@@ -0,0 +1,58 @@
+use clap;
+use {Command, Result};
+
+use mullvad_ipc_client::DaemonRpcClient;
+
+pub struct AutoConnect;
+
+impl Command for AutoConnect {
+    fn name(&self) -> &'static str {
+        "auto-connect"
+    }
+
+    fn clap_subcommand(&self) -> clap::App<'static, 'static> {
+        clap::SubCommand::with_name(self.name())
+            .about("Control the daemon auto-connect setting")
+            .setting(clap::AppSettings::SubcommandRequired)
+            .subcommand(
+                clap::SubCommand::with_name("set")
+                    .about("Change auto-connect setting")
+                    .arg(
+                        clap::Arg::with_name("policy")
+                            .required(true)
+                            .possible_values(&["on", "off"]),
+                    ),
+            )
+            .subcommand(
+                clap::SubCommand::with_name("get")
+                    .about("Display the current auto-connect setting"),
+            )
+    }
+
+    fn run(&self, matches: &clap::ArgMatches) -> Result<()> {
+        if let Some(set_matches) = matches.subcommand_matches("set") {
+            let auto_connect = value_t_or_exit!(set_matches.value_of("policy"), String);
+            self.set(auto_connect == "on")
+        } else if let Some(_matches) = matches.subcommand_matches("get") {
+            self.get()
+        } else {
+            unreachable!("No auto-connect command given");
+        }
+    }
+}
+
+impl AutoConnect {
+    fn set(&self, auto_connect: bool) -> Result<()> {
+        let mut rpc = DaemonRpcClient::new()?;
+        rpc.set_auto_connect(auto_connect)?;
+        println!("Changed auto-connect sharing setting");
+        Ok(())
+    }
+
+    fn get(&self) -> Result<()> {
+        let mut rpc = DaemonRpcClient::new()?;
+        let auto_connect = rpc.get_auto_connect()?;
+        println!("Autoconnect: {}", if auto_connect { "on" } else { "off" });
+        Ok(())
+    }
+}
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 4e54aadbca..613a1e69d6 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -4,6 +4,9 @@ use Command;
 mod account;
 pub use self::account::Account;
 
+mod auto_connect;
+pub use self::auto_connect::AutoConnect;
+
 mod status;
 pub use self::status::Status;
 
@@ -29,6 +32,7 @@ pub use self::version::Version;
 pub fn get_commands() -> HashMap<&'static str, Box<Command>> {
     let commands: Vec<Box<Command>> = vec![
         Box::new(Account),
+        Box::new(AutoConnect),
         Box::new(Status),
         Box::new(Connect),
         Box::new(Disconnect),
diff --git a/mullvad-ipc-client/src/lib.rs b/mullvad-ipc-client/src/lib.rs
index cbf6a9b2e5..51cba68eab 100644
--- a/mullvad-ipc-client/src/lib.rs
+++ b/mullvad-ipc-client/src/lib.rs
@@ -155,10 +155,22 @@ impl DaemonRpcClient {
         self.call("get_account_data", &[account])
     }
 
+    pub fn set_allow_lan(&mut self, allow_lan: bool) -> Result<()> {
+        self.call("set_allow_lan", &[allow_lan])
+    }
+
     pub fn get_allow_lan(&mut self) -> Result<bool> {
         self.call("get_allow_lan", &NO_ARGS)
     }
 
+    pub fn set_auto_connect(&mut self, auto_connect: bool) -> Result<()> {
+        self.call("set_auto_connect", &[auto_connect])
+    }
+
+    pub fn get_auto_connect(&mut self) -> Result<bool> {
+        self.call("get_auto_connect", &NO_ARGS)
+    }
+
     pub fn get_current_location(&mut self) -> Result<GeoIpLocation> {
         self.call("get_current_location", &NO_ARGS)
     }
@@ -191,10 +203,6 @@ impl DaemonRpcClient {
         self.call("set_account", &[account])
     }
 
-    pub fn set_allow_lan(&mut self, allow_lan: bool) -> Result<()> {
-        self.call("set_allow_lan", &[allow_lan])
-    }
-
     pub fn set_openvpn_mssfix(&mut self, mssfix: Option<u16>) -> Result<()> {
         self.call("set_openvpn_mssfix", &[mssfix])
     }