diff options
| -rw-r--r-- | mullvad-daemon/src/main.rs | 3 | ||||
| -rw-r--r-- | mullvad-daemon/src/management_interface.rs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs index d2c21ce0c3..c9493d3778 100644 --- a/mullvad-daemon/src/main.rs +++ b/mullvad-daemon/src/main.rs @@ -6,6 +6,7 @@ //! GNU General Public License as published by the Free Software Foundation, either version 3 of //! the License, or (at your option) any later version. + extern crate app_dirs; extern crate chrono; #[macro_use] @@ -347,7 +348,7 @@ impl Daemon { match event { SetTargetState(state) => self.on_set_target_state(state), GetState(tx) => Ok(self.on_get_state(tx)), - GetIp(tx) => Ok(self.on_get_ip(tx)), + GetPublicIp(tx) => Ok(self.on_get_ip(tx)), GetCurrentLocation(tx) => Ok(self.on_get_current_location(tx)), GetAccountData(tx, account_token) => Ok(self.on_get_account_data(tx, account_token)), GetRelayLocations(tx) => Ok(self.on_get_relay_locations(tx)), diff --git a/mullvad-daemon/src/management_interface.rs b/mullvad-daemon/src/management_interface.rs index f0cfac7fd7..1f56d5ba0d 100644 --- a/mullvad-daemon/src/management_interface.rs +++ b/mullvad-daemon/src/management_interface.rs @@ -142,7 +142,7 @@ pub enum TunnelCommand { /// Request the current state. GetState(OneshotSender<DaemonState>), /// Get the current IP as viewed from the internet. - GetIp(OneshotSender<IpAddr>), + GetPublicIp(OneshotSender<IpAddr>), /// Get the current geographical location. GetCurrentLocation(OneshotSender<Location>), /// Request the metadata for an account. @@ -479,7 +479,7 @@ impl<T: From<TunnelCommand> + 'static + Send> ManagementInterfaceApi for Managem trace!("get_public_ip"); try_future!(self.check_auth(&meta)); let (tx, rx) = sync::oneshot::channel(); - let future = self.send_command_to_daemon(TunnelCommand::GetIp(tx)) + let future = self.send_command_to_daemon(TunnelCommand::GetPublicIp(tx)) .and_then(|_| rx.map_err(|_| Error::internal_error())); Box::new(future) } |