summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorEmīls Piņķis <emils@mullvad.net>2022-09-20 15:40:22 +0200
committerEmīls Piņķis <emils@mullvad.net>2022-09-22 13:14:08 +0200
commit31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244 (patch)
treebcbd0bb71f573211216b0bc1bcf5e34a66da284f /mullvad-daemon/src
parentbffb61277031df7c58d08ffb79abc4346d27b58f (diff)
downloadmullvadvpn-31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244.tar.xz
mullvadvpn-31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244.zip
Remove shutdown GRPC
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/lib.rs2
-rw-r--r--mullvad-daemon/src/management_interface.rs6
2 files changed, 2 insertions, 6 deletions
diff --git a/mullvad-daemon/src/lib.rs b/mullvad-daemon/src/lib.rs
index d2aea87af8..7a1a2e75da 100644
--- a/mullvad-daemon/src/lib.rs
+++ b/mullvad-daemon/src/lib.rs
@@ -284,6 +284,7 @@ pub enum DaemonCommand {
/// Register settings for WireGuard obfuscator
SetObfuscationSettings(ResponseTx<(), settings::Error>, ObfuscationSettings),
/// Makes the daemon exit the main loop and quit.
+ #[cfg(target_os = "android")]
Shutdown,
/// Saves the target tunnel state and enters a blocking state. The state is restored
/// upon restart.
@@ -1032,6 +1033,7 @@ where
SetObfuscationSettings(tx, settings) => {
self.on_set_obfuscation_settings(tx, settings).await
}
+ #[cfg(target_os = "android")]
Shutdown => self.trigger_shutdown_event(false),
PrepareRestart => self.on_prepare_restart(),
#[cfg(target_os = "android")]
diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs
index bac3ed0f93..ccaa22a624 100644
--- a/mullvad-daemon/src/management_interface.rs
+++ b/mullvad-daemon/src/management_interface.rs
@@ -111,12 +111,6 @@ impl ManagementService for ManagementServiceImpl {
Ok(Response::new(()))
}
- async fn shutdown(&self, _: Request<()>) -> ServiceResult<()> {
- log::debug!("shutdown");
- self.send_command_to_daemon(DaemonCommand::Shutdown)?;
- Ok(Response::new(()))
- }
-
async fn factory_reset(&self, _: Request<()>) -> ServiceResult<()> {
#[cfg(not(target_os = "android"))]
{