diff options
| -rw-r--r-- | talpid-core/src/tunnel_state_machine/connecting_state.rs | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs index 228bc0c6fd..2d0e8d7795 100644 --- a/talpid-core/src/tunnel_state_machine/connecting_state.rs +++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs @@ -262,14 +262,17 @@ impl ConnectingState { self.into_connected_state_bootstrap(metadata), )), Ok(_) => SameState(self), - Err(_) => NewState(DisconnectingState::enter( - shared_values, - ( - self.close_handle, - self.tunnel_close_event, - AfterDisconnect::Reconnect(self.tunnel_parameters), - ), - )), + Err(_) => { + debug!("The OpenVPN tunnel event plugin disconnected"); + NewState(DisconnectingState::enter( + shared_values, + ( + self.close_handle, + self.tunnel_close_event, + AfterDisconnect::Reconnect(self.tunnel_parameters), + ), + )) + } } } @@ -277,16 +280,14 @@ impl ConnectingState { mut self, shared_values: &mut SharedTunnelStateValues, ) -> EventConsequence<Self> { - use self::EventConsequence::*; - match self.tunnel_close_event.poll() { Ok(Async::Ready(_)) => {} - Ok(Async::NotReady) => return NoEvents(self), + Ok(Async::NotReady) => return EventConsequence::NoEvents(self), Err(_cancelled) => warn!("Tunnel monitor thread has stopped unexpectedly"), } info!("Tunnel closed. Reconnecting."); - NewState(ConnectingState::enter( + EventConsequence::NewState(ConnectingState::enter( shared_values, self.tunnel_parameters, )) |