Fix: don't ack hop messages in Client state

maidsafe · Apr 26, 2019 · 9539c05 · 9539c05
1 parent 3a37a9e
commit 9539c05
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 6 deletions.
diff --git a/src/state_machine.rs b/src/state_machine.rs
@@ -56,8 +56,6 @@ pub enum State {
     Bootstrapping(Bootstrapping),
     Client(Client),
     JoiningNode(JoiningNode),
-    // TODO: remove
-    #[allow(dead_code)]
     ProvingNode(ProvingNode),
     Node(Node),
     Terminated,

diff --git a/src/states/client.rs b/src/states/client.rs
@@ -200,7 +200,7 @@ impl Client {
             return Err(RoutingError::UnknownConnection(pub_id));
         }
 
-        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id)? {
+        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id, false)? {
             Ok(self.dispatch_routing_message(routing_msg, outbox))
         } else {
             Ok(Transition::Stay)

diff --git a/src/states/common/unapproved.rs b/src/states/common/unapproved.rs
@@ -26,6 +26,7 @@ pub trait Unapproved: Bootstrapped {
         &mut self,
         hop_msg: HopMessage,
         pub_id: PublicId,
+        send_ack: bool,
     ) -> Result<Option<RoutingMessage>, RoutingError> {
         hop_msg.verify(pub_id.signing_public_key())?;
 
@@ -34,7 +35,7 @@ pub trait Unapproved: Bootstrapped {
 
         let routing_msg = signed_msg.into_routing_message();
         let in_authority = self.in_authority(&routing_msg.dst);
-        if in_authority {
+        if in_authority && send_ack {
             self.send_ack(&routing_msg, 0);
         }
 

diff --git a/src/states/joining_node.rs b/src/states/joining_node.rs
@@ -215,7 +215,7 @@ impl JoiningNode {
             return Err(RoutingError::UnknownConnection(pub_id));
         }
 
-        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id)? {
+        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id, true)? {
             Ok(self.dispatch_routing_message(routing_msg))
         } else {
             Ok(Transition::Stay)

diff --git a/src/states/proving_node.rs b/src/states/proving_node.rs
@@ -304,7 +304,7 @@ impl ProvingNode {
             _ => return Err(RoutingError::UnknownConnection(pub_id)),
         }
 
-        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id)? {
+        if let Some(routing_msg) = self.filter_hop_message(hop_msg, pub_id, true)? {
             self.dispatch_routing_message(routing_msg, outbox)
         } else {
             Ok(Transition::Stay)