Merge branch 'easier-to-use-daemon-as-library'

2 files changed, 24 insertions, 4 deletions

diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index aab7f406f7..37d6e7f6d5 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -14,11 +14,14 @@ extern crate serde;
 
 mod account_history;
 mod geoip;
+pub mod logging;
 mod management_interface;
 mod relays;
 mod rpc_uniqueness_check;
+pub mod version;
 
-use crate::management_interface::{BoxFuture, ManagementCommand, ManagementInterfaceServer};
+pub use crate::management_interface::ManagementCommand;
+use crate::management_interface::{BoxFuture, ManagementInterfaceServer};
 use futures::{
     future,
     sync::{mpsc::UnboundedSender, oneshot},
@@ -57,6 +60,9 @@ pub enum Error {
     #[error(display = "Another instance of the daemon is already running")]
     DaemonIsAlreadyRunning,
 
+    #[error(display = "Failed to send command to daemon because it is not running")]
+    DaemonUnavailable,
+
     #[error(display = "Unable to initialize network event loop")]
     InitIoEventLoop(#[error(cause)] io::Error),
 
@@ -160,6 +166,17 @@ impl DaemonExecutionState {
     }
 }
 
+pub struct DaemonCommandSender(IntoSender<ManagementCommand, InternalDaemonEvent>);
+
+impl DaemonCommandSender {
+    pub(crate) fn new(internal_event_sender: mpsc::Sender<InternalDaemonEvent>) -> Self {
+        DaemonCommandSender(IntoSender::from(internal_event_sender))
+    }
+
+    pub fn send(&self, command: ManagementCommand) -> Result<()> {
+        self.0.send(command).map_err(|_| Error::DaemonUnavailable)
+    }
+}
 
 pub struct Daemon {
     tunnel_command_tx: SyncUnboundedSender<TunnelCommand>,
@@ -307,6 +324,11 @@ impl Daemon {
         });
     }
 
+    /// Retrieve a channel for sending daemon commands.
+    pub fn command_sender(&self) -> DaemonCommandSender {
+        DaemonCommandSender::new(self.tx.clone())
+    }
+
     /// Consume the `Daemon` and run the main event loop. Blocks until an error happens or a
     /// shutdown event is received.
     pub fn run(mut self) -> Result<()> {
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index e9346405d9..8deae9f489 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -9,16 +9,14 @@
 #![deny(rust_2018_idioms)]
 
 use log::{debug, error, info, warn};
-use mullvad_daemon::Daemon;
+use mullvad_daemon::{logging, version, Daemon};
 use std::{path::PathBuf, thread, time::Duration};
 use talpid_types::ErrorExt;
 
 mod cli;
-mod logging;
 mod shutdown;
 #[cfg(windows)]
 mod system_service;
-mod version;
 
 const DAEMON_LOG_FILENAME: &str = "daemon.log";