diff options
| author | Emīls Piņķis <emils@mullvad.net> | 2022-09-20 15:40:22 +0200 |
|---|---|---|
| committer | Emīls Piņķis <emils@mullvad.net> | 2022-09-22 13:14:08 +0200 |
| commit | 31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244 (patch) | |
| tree | bcbd0bb71f573211216b0bc1bcf5e34a66da284f | |
| parent | bffb61277031df7c58d08ffb79abc4346d27b58f (diff) | |
| download | mullvadvpn-31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244.tar.xz mullvadvpn-31d88f68d5fd226e5634fcf3a0ceaa08a4dcf244.zip | |
Remove shutdown GRPC
| -rw-r--r-- | mullvad-daemon/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 6 | ||||
| -rw-r--r-- | mullvad-management-interface/proto/management_interface.proto | 1 |
3 files changed, 2 insertions, 7 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"))] { diff --git a/mullvad-management-interface/proto/management_interface.proto b/mullvad-management-interface/proto/management_interface.proto index 8ec2bdf529..5789728fce 100644 --- a/mullvad-management-interface/proto/management_interface.proto +++ b/mullvad-management-interface/proto/management_interface.proto @@ -18,7 +18,6 @@ service ManagementService { // Control the daemon and receive events rpc EventsListen(google.protobuf.Empty) returns (stream DaemonEvent) {} rpc PrepareRestart(google.protobuf.Empty) returns (google.protobuf.Empty) {} - rpc Shutdown(google.protobuf.Empty) returns (google.protobuf.Empty) {} rpc FactoryReset(google.protobuf.Empty) returns (google.protobuf.Empty) {} rpc GetCurrentVersion(google.protobuf.Empty) returns (google.protobuf.StringValue) {} |