diff options
| author | Linus Färnstrand <linus@mullvad.net> | 2019-09-11 12:53:04 +0200 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-13 11:28:56 +0200 |
| commit | cf0459a0aa5c5a9064bd9f242cc0e8fab22213bd (patch) | |
| tree | 0aa6d71c40050aac94546fb0cd14743ad133497e | |
| parent | 9ea621a252b1d22afa4d887276c3a6e54c47d750 (diff) | |
| download | mullvadvpn-cf0459a0aa5c5a9064bd9f242cc0e8fab22213bd.tar.xz mullvadvpn-cf0459a0aa5c5a9064bd9f242cc0e8fab22213bd.zip | |
Update daemon to handle relay_list_v3
| -rw-r--r-- | mullvad-daemon/src/relays.rs | 2 | ||||
| -rw-r--r-- | mullvad-rpc/src/lib.rs | 2 | ||||
| -rw-r--r-- | mullvad-types/src/relay_list.rs | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-daemon/src/relays.rs b/mullvad-daemon/src/relays.rs index ea1bcc3114..a046535b30 100644 --- a/mullvad-daemon/src/relays.rs +++ b/mullvad-daemon/src/relays.rs @@ -762,7 +762,7 @@ impl RelayListUpdater { } fn download_relay_list(&mut self) -> Result<RelayList, Error> { - let download_future = self.rpc_client.relay_list_v2().map_err(Error::Download); + let download_future = self.rpc_client.relay_list_v3().map_err(Error::Download); let relay_list = Timer::default() .timeout(download_future, DOWNLOAD_TIMEOUT) .wait()?; diff --git a/mullvad-rpc/src/lib.rs b/mullvad-rpc/src/lib.rs index a68dfea0fa..1d2fdcf758 100644 --- a/mullvad-rpc/src/lib.rs +++ b/mullvad-rpc/src/lib.rs @@ -118,7 +118,7 @@ jsonrpc_client!(pub struct ProblemReportProxy { }); jsonrpc_client!(pub struct RelayListProxy { - pub fn relay_list_v2(&mut self) -> RpcRequest<RelayList>; + pub fn relay_list_v3(&mut self) -> RpcRequest<RelayList>; }); jsonrpc_client!(pub struct AppVersionProxy { diff --git a/mullvad-types/src/relay_list.rs b/mullvad-types/src/relay_list.rs index 370b8e134f..ee87751c43 100644 --- a/mullvad-types/src/relay_list.rs +++ b/mullvad-types/src/relay_list.rs @@ -48,6 +48,7 @@ pub struct Relay { pub hostname: String, pub ipv4_addr_in: Ipv4Addr, pub include_in_country: bool, + pub active: bool, pub weight: u64, #[serde(skip_serializing_if = "RelayTunnels::is_empty", default)] pub tunnels: RelayTunnels, |