summaryrefslogtreecommitdiffhomepage
path: root/mullvad-daemon/src
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2018-08-27 15:08:36 +0200
committerLinus Färnstrand <linus@mullvad.net>2018-08-27 15:25:55 +0200
commit90b04e8d6ea85e95d174a416c70017581be166e7 (patch)
treeb0a8f85ff7de2d9718493cfddc954228ae5435eb /mullvad-daemon/src
parent3f532aa3110969109d0e0149025d44b8b4de7001 (diff)
downloadmullvadvpn-90b04e8d6ea85e95d174a416c70017581be166e7.tar.xz
mullvadvpn-90b04e8d6ea85e95d174a416c70017581be166e7.zip
Rename firewall module to security
Diffstat (limited to 'mullvad-daemon/src')
-rw-r--r--mullvad-daemon/src/tunnel_state_machine/connected_state.rs2
-rw-r--r--mullvad-daemon/src/tunnel_state_machine/connecting_state.rs2
-rw-r--r--mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs2
-rw-r--r--mullvad-daemon/src/tunnel_state_machine/mod.rs2
4 files changed, 4 insertions, 4 deletions
diff --git a/mullvad-daemon/src/tunnel_state_machine/connected_state.rs b/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
index a93dd5f6ce..88b12e3ec8 100644
--- a/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/connected_state.rs
@@ -1,7 +1,7 @@
use futures::sync::{mpsc, oneshot};
use futures::{Async, Future, Stream};
-use talpid_core::firewall::{NetworkSecurity, SecurityPolicy};
+use talpid_core::security::{NetworkSecurity, SecurityPolicy};
use talpid_core::tunnel::{CloseHandle, TunnelEvent, TunnelMetadata};
use talpid_types::net::TunnelEndpoint;
diff --git a/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs b/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
index 150c8915a5..c05d85d217 100644
--- a/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/connecting_state.rs
@@ -8,7 +8,7 @@ use futures::sink::Wait;
use futures::sync::{mpsc, oneshot};
use futures::{Async, Future, Sink, Stream};
-use talpid_core::firewall::{NetworkSecurity, SecurityPolicy};
+use talpid_core::security::{NetworkSecurity, SecurityPolicy};
use talpid_core::tunnel::{CloseHandle, TunnelEvent, TunnelMetadata, TunnelMonitor};
use talpid_types::net::{TunnelEndpoint, TunnelEndpointData};
diff --git a/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs b/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
index a768100261..a64f2ca543 100644
--- a/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/disconnected_state.rs
@@ -2,7 +2,7 @@ use error_chain::ChainedError;
use futures::sync::mpsc;
use futures::Stream;
-use talpid_core::firewall::NetworkSecurity;
+use talpid_core::security::NetworkSecurity;
use super::{
ConnectingState, Error, EventConsequence, SharedTunnelStateValues, StateEntryResult,
diff --git a/mullvad-daemon/src/tunnel_state_machine/mod.rs b/mullvad-daemon/src/tunnel_state_machine/mod.rs
index f30c990f98..29e1e5869a 100644
--- a/mullvad-daemon/src/tunnel_state_machine/mod.rs
+++ b/mullvad-daemon/src/tunnel_state_machine/mod.rs
@@ -17,8 +17,8 @@ use futures::{Async, Future, Poll, Stream};
use tokio_core::reactor::Core;
use mullvad_types::account::AccountToken;
-use talpid_core::firewall::{NetworkSecurity, NetworkSecurityImpl};
use talpid_core::mpsc::IntoSender;
+use talpid_core::security::{NetworkSecurity, NetworkSecurityImpl};
use talpid_types::net::{TunnelEndpoint, TunnelOptions};
use self::connected_state::{ConnectedState, ConnectedStateBootstrap};