summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-09-05 15:50:53 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-09-05 15:50:53 +0200
commitfb40dedf46348e8764aed95610b135e40c3b1ba1 (patch)
tree9efdcfe4e6d1c0d01417f5b9f8fdeb0f10637312 /mullvad-daemon/src
parente1e8b371ab146916ee5074102800c197f2232302 (diff)
parent1b44398fb05dc69e24f3a389e43f926f7512e6c8 (diff)
downloadmullvadvpn-fb40dedf46348e8764aed95610b135e40c3b1ba1.tar.xz
mullvadvpn-fb40dedf46348e8764aed95610b135e40c3b1ba1.zip
Merge branch 'blocked-state-block-network'
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/main.rs5
1 files changed, 3 insertions, 2 deletions
diff --git a/mullvad-daemon/src/main.rs b/mullvad-daemon/src/main.rs
index 2fb27c3048..b67658c2ab 100644
--- a/mullvad-daemon/src/main.rs
+++ b/mullvad-daemon/src/main.rs
@@ -604,8 +604,9 @@ impl Daemon {
}
fn connect_tunnel(&mut self) {
+ let allow_lan = self.settings.get_allow_lan();
let command = match self.settings.get_account_token() {
- None => TunnelCommand::Block(BlockReason::NoAccountToken),
+ None => TunnelCommand::Block(BlockReason::NoAccountToken, allow_lan),
Some(account_token) => match self.settings.get_relay_settings() {
RelaySettings::CustomTunnelEndpoint(custom_relay) => custom_relay
.to_tunnel_endpoint()
@@ -622,7 +623,7 @@ impl Daemon {
.map(|parameters| TunnelCommand::Connect(parameters))
.unwrap_or_else(|error| {
error!("{}", error.display_chain());
- TunnelCommand::Block(BlockReason::NoMatchingRelay)
+ TunnelCommand::Block(BlockReason::NoMatchingRelay, allow_lan)
}),
};
self.send_tunnel_command(command);