Send tunnel endpoint on connected and connecting

2 files changed, 6 insertions, 5 deletions

diff --git a/talpid-core/src/tunnel_state_machine/connected_state.rs b/talpid-core/src/tunnel_state_machine/connected_state.rs
index a969ece39f..d648b43ec4 100644
--- a/talpid-core/src/tunnel_state_machine/connected_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connected_state.rs
@@ -149,12 +149,13 @@ impl TunnelState for ConnectedState {
         shared_values: &mut SharedTunnelStateValues,
         bootstrap: Self::Bootstrap,
     ) -> (TunnelStateWrapper, TunnelStateTransition) {
+        let tunnel_endpoint = bootstrap.tunnel_parameters.endpoint;
         let connected_state = ConnectedState::from(bootstrap);
 
         match connected_state.set_security_policy(shared_values) {
             Ok(()) => (
                 TunnelStateWrapper::from(connected_state),
-                TunnelStateTransition::Connected,
+                TunnelStateTransition::Connected(tunnel_endpoint),
             ),
             Err(error) => {
                 error!("{}", error.display_chain());
diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 1e0880141e..f2ce3e0b4e 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -283,9 +283,9 @@ impl TunnelState for ConnectingState {
         {
             None => BlockedState::enter(shared_values, BlockReason::NoMatchingRelay),
             Some(tunnel_parameters) => {
-                if let Err(error) =
-                    Self::set_security_policy(shared_values, tunnel_parameters.endpoint)
-                {
+                let tunnel_endpoint = tunnel_parameters.endpoint;
+
+                if let Err(error) = Self::set_security_policy(shared_values, tunnel_endpoint) {
                     error!("{}", error.display_chain());
                     BlockedState::enter(shared_values, BlockReason::StartTunnelError)
                 } else {
@@ -297,7 +297,7 @@ impl TunnelState for ConnectingState {
                     ) {
                         Ok(connecting_state) => (
                             TunnelStateWrapper::from(connecting_state),
-                            TunnelStateTransition::Connecting,
+                            TunnelStateTransition::Connecting(tunnel_endpoint),
                         ),
                         Err(error) => {
                             let block_reason = match *error.kind() {