summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLinus Färnstrand <linus@mullvad.net>2017-06-16 15:23:35 +0200
committerLinus Färnstrand <linus@mullvad.net>2017-06-16 15:23:35 +0200
commitf642c9b3acb2b3d041634ec877b60c496198e5c1 (patch)
tree11f80ee610fb2e3ee73a8361ef5d03491bdb8830
parente5ca34949b401bd5054ac7b9e3f69edcbecbd893 (diff)
downloadmullvadvpn-f642c9b3acb2b3d041634ec877b60c496198e5c1.tar.xz
mullvadvpn-f642c9b3acb2b3d041634ec877b60c496198e5c1.zip
Rename broadcaster field
-rw-r--r--mullvad_daemon/src/main.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/mullvad_daemon/src/main.rs b/mullvad_daemon/src/main.rs
index 3e9e02a419..fa1db7765c 100644
--- a/mullvad_daemon/src/main.rs
+++ b/mullvad_daemon/src/main.rs
@@ -107,7 +107,7 @@ struct Daemon {
rx: mpsc::Receiver<DaemonEvent>,
tx: mpsc::Sender<DaemonEvent>,
tunnel_close_handle: Option<tunnel::CloseHandle>,
- management_interface_subscribers: management_interface::EventBroadcaster,
+ management_interface_broadcaster: management_interface::EventBroadcaster,
// Just for testing. A cyclic iterator iterating over the hardcoded remotes,
// picking a new one for each retry.
@@ -117,7 +117,7 @@ struct Daemon {
impl Daemon {
pub fn new() -> Result<Self> {
let (tx, rx) = mpsc::channel();
- let management_interface_subscribers = Self::start_management_interface(tx.clone())?;
+ let management_interface_broadcaster = Self::start_management_interface(tx.clone())?;
Ok(
Daemon {
state: TunnelState::NotRunning,
@@ -126,8 +126,8 @@ impl Daemon {
rx,
tx,
tunnel_close_handle: None,
+ management_interface_broadcaster,
remote_iter: REMOTES.iter().cloned().cycle(),
- management_interface_subscribers,
},
)
}
@@ -228,7 +228,7 @@ impl Daemon {
let new_security_state = self.state.as_security_state();
if self.last_broadcasted_state != new_security_state {
self.last_broadcasted_state = new_security_state;
- self.management_interface_subscribers.notify_new_state(new_security_state);
+ self.management_interface_broadcaster.notify_new_state(new_security_state);
}
}
}