feat(rust): keep the same port for incoming services

Author: davide-baldo

implementations/rust/ockam/ockam_app_lib/src/incoming_services/commands.rs

@@ -44,14 +44,15 @@ impl AppState {
                     Ok(port) => {
                         if let Some(service) = guard.find_mut_by_id(service.id()) {
                             if let Some(port) = port {
-                                service.set_port(port)
+                                service.set_port(port);
                             }
+                            service.set_connected(true);
                         }
                     }
                     Err(err) => {
                         warn!(%err, "Failed to refresh TCP inlet for accepted invitation");
                         if let Some(service) = guard.find_mut_by_id(service.id()) {
-                            service.remove_port()
+                            service.set_connected(false);
                         }
                     }
                 }

implementations/rust/ockam/ockam_app_lib/src/incoming_services/state.rs

@@ -175,6 +175,8 @@ pub struct IncomingService {
     // this field contains the current port number
     // it also reflects if the inlet is connected with the destination node
     port: Option<Port>,
+    // true when connected to the destination node
+    connected: bool,
     // whether the service should be enabled or not, this is the driver for the inlet
     // and may not reflect the current status
     enabled: bool,
@@ -216,6 +218,7 @@ impl IncomingService {
             shared_node_identifier,
             original_name,
             enrollment_ticket,
+            connected: false,
             removed: false,
         }
     }
@@ -240,6 +243,11 @@ impl IncomingService {
         self.port
     }
 
+    /// Returns true if the inlet is connected to the destination node
+    pub fn is_connected(&self) -> bool {
+        self.connected
+    }
+
     /// The address of the inlet, if service is connected to the destination node
     pub fn address(&self) -> Option<SocketAddr> {
         self.port
@@ -259,16 +267,15 @@ impl IncomingService {
         self.port = Some(port);
     }
 
-    pub fn remove_port(&mut self) {
-        self.port = None;
+    pub fn set_connected(&mut self, connected: bool) {
+        self.connected = connected;
     }
 
     pub fn enable(&mut self) {
         self.enabled = true;
     }
     pub fn disable(&mut self) {
         self.enabled = false;
-        self.port = None;
     }
 
     /// True when the service is marked as removed

implementations/rust/ockam/ockam_app_lib/src/state/mod.rs

@@ -622,7 +622,7 @@ impl AppState {
                                 address: service.address().map(|addr| addr.ip().to_string()),
                                 port: service.port(),
                                 scheme: None,
-                                available: service.port().is_some(),
+                                available: service.is_connected(),
                                 enabled: service.enabled(),
                             })
                             .collect();