fix: only send to client directly when it belongs to self section

src/routing/comm.rs

@@ -116,7 +116,7 @@ impl Comm {
             .send_message(msg, recipient)
             .await
             .map_err(|err| {
-                error!("{}", err);
+                error!("Sending to {:?} failed with {}", recipient, err);
                 SendError
             })
     }

src/routing/core.rs

@@ -1085,6 +1085,7 @@ impl Core {
     }
 
     fn handle_user_message(&mut self, msg: &Message, content: Bytes) -> Result<Vec<Command>> {
+        trace!("handle user message {:?}", msg);
         if let DstLocation::EndUser(end_user) = msg.dst() {
             let recipients = match end_user {
                 EndUser::AllClients(public_key) => {
@@ -1099,8 +1100,10 @@ impl Core {
                 }
             };
             if recipients.is_empty() {
+                trace!("Cannot route user message, recipient list empty: {:?}", msg);
                 return Err(Error::CannotRoute);
             };
+            trace!("sending user message {:?} to client {:?}", msg, recipients);
             return Ok(vec![Command::SendMessage {
                 recipients,
                 delivery_group_size: 1,
@@ -2092,8 +2095,9 @@ impl Core {
         }
 
         trace!(
-            "relay {:?} to {:?} (proof_chain: {:?})",
+            "relay {:?} to first {:?} of {:?} (proof_chain: {:?})",
             msg,
+            dg_size,
             targets,
             msg.proof_chain().ok()
         );
@@ -2106,12 +2110,11 @@ impl Core {
 
     #[allow(unused)]
     pub fn check_key_status(&self, bls_pk: &bls::PublicKey) -> Result<(), TargetSectionError> {
+        let elders_candidates = self.section.promote_and_demote_elders(&self.node.name());
         // Whenever there is EldersInfo change candidate, it is considered as having ongoing DKG.
-        if !self
-            .section
-            .promote_and_demote_elders(&self.node.name())
-            .is_empty()
-        {
+        if !elders_candidates.is_empty() {
+            trace!("Non empty elder candidates {:?}", elders_candidates);
+            trace!("Current erlders_info {:?}", self.section.elders_info());
             return Err(TargetSectionError::DkgInProgress);
         }
         if !self.section.chain().has_key(bls_pk) {

src/routing/dispatcher.rs

@@ -207,6 +207,11 @@ impl Dispatcher {
                         .await
                         .is_err()
                     {
+                        trace!(
+                            "Lost connection to client {:?} when sending message {:?}",
+                            recipient,
+                            message
+                        );
                         self.send_event(Event::ClientLost(*recipient)).await;
                     }
                 }

src/routing/mod.rs

@@ -357,24 +357,33 @@ impl Routing {
             public_key,
         }) = itinerary.dst
         {
-            let socket_addr = self
-                .dispatcher
-                .core
-                .lock()
-                .await
-                .get_socket_addr(socket_id)
-                .copied();
-
-            if let Some(socket_addr) = socket_addr {
-                return self
-                    .send_message_to_client(socket_addr, ClientMessage::from(content)?)
-                    .await;
+            let name = XorName::from(public_key);
+            if self.our_prefix().await.matches(&name) {
+                let socket_addr = self
+                    .dispatcher
+                    .core
+                    .lock()
+                    .await
+                    .get_socket_addr(socket_id)
+                    .copied();
+
+                if let Some(socket_addr) = socket_addr {
+                    debug!(
+                        "Sending client msg of {:?} to {:?}",
+                        public_key, socket_addr
+                    );
+                    return self
+                        .send_message_to_client(socket_addr, ClientMessage::from(content)?)
+                        .await;
+                } else {
+                    debug!(
+                        "Could not find socketaddr corresponding to socket_id {:?} and public_key {:?}",
+                        socket_id, public_key
+                    );
+                    debug!("Sending user message instead.. (Command::SendUserMessage)");
+                }
             } else {
-                debug!(
-                    "Could not find socketaddr corresponding to socket_id {:?} and public_key {:?}",
-                    socket_id, public_key
-                );
-                debug!("Sending user message instead.. (Command::SendUserMessage)");
+                debug!("Relaying message with sending user message (Command::SendUserMessage)");
             }
         }
         let command = Command::SendUserMessage {