fix:bug fix

Author: Bordi00

src/packet_processor.rs

@@ -1,3 +1,5 @@
+use std::sync::{Arc, Barrier};
+
 use crate::{FragmentAssembler, RoutingHandler, network::NetworkError, types::Command};
 
 use crossbeam_channel::{Receiver, select_biased};
@@ -25,6 +27,12 @@ pub trait Processor: Send {
                 let idx = fragment.fragment_index;
                 let mut shr = pkt.routing_header.clone();
                 shr.reverse();
+                shr.increase_hop_index();
+                assert!(
+                    shr.hop_index == 1,
+                    "hop_index should be 1, got {}",
+                    shr.hop_index
+                );
                 self.routing_handler().send_ack(shr, pkt.session_id, idx)?;
                 if let Some(msg) = self.assembler().add_fragment(
                     fragment,
@@ -50,7 +58,8 @@ pub trait Processor: Send {
         Ok(())
     }
 
-    fn run(&mut self) {
+    fn run(&mut self, barrier: Arc<Barrier>) {
+        barrier.wait();
         let _ = self.routing_handler().start_flood(None);
         loop {
             select_biased! {

src/routing_handler.rs

@@ -87,7 +87,7 @@ pub struct RoutingHandler {
     flood_counter: u64,
     controller_send: Sender<Box<dyn Event>>,
     buffer: Buffer,
-    node_type: NodeType
+    node_type: NodeType,
 }
 
 impl RoutingHandler {
@@ -107,7 +107,7 @@ impl RoutingHandler {
             flood_seen: HashSet::new(),
             controller_send,
             buffer: Buffer::new(),
-            node_type
+            node_type,
         }
     }
 
@@ -137,7 +137,11 @@ impl RoutingHandler {
         let packet = Packet::new_flood_request(
             SourceRoutingHeader::empty_route(),
             self.session_counter,
-            FloodRequest::new(self.flood_counter, self.id),
+            FloodRequest {
+                flood_id: self.flood_counter,
+                initiator_id: self.id,
+                path_trace: vec![(self.id, self.node_type)],
+            },
         );
         self.controller_send
             .send(Box::new(NodeEvent::FloodStarted(
@@ -415,14 +419,15 @@ impl RoutingHandler {
                         Fragment::new(i as u64, total_n_fragments, Self::pad_chunk(chunk));
                     let packet = Packet::new_fragment(shr.clone(), session_id, fragment);
                     self.try_send(packet)?;
-                    
                 }
-                
-                self.controller_send.send(Box::new(NodeEvent::MessageSent {
-                    notification_from: self.id,
-                    to: destination,
-                })).map_err(|_e| NetworkError::ControllerDisconnected)?;
-                    
+
+                self.controller_send
+                    .send(Box::new(NodeEvent::MessageSent {
+                        notification_from: self.id,
+                        to: destination,
+                    }))
+                    .map_err(|_e| NetworkError::ControllerDisconnected)?;
+
                 return Ok(());
             }
 

src/types.rs

@@ -316,7 +316,6 @@ pub enum ChatEvent {
     },
     ErrorClientNotFound {
         notification_from: NodeId,
-        location: NodeId,
         not_found: NodeId,
     },