From 8341895796681ff45167200acb17d7a5cb4d5cb1 Mon Sep 17 00:00:00 2001 From: NathanMcMillan54 Date: Sun, 3 Nov 2024 19:21:47 +0000 Subject: [PATCH] Messages are received properly by darklight_driver. --- .../distributor/distributor/src/distributor/distributors/mod.rs | 2 ++ dlwp/src/message.rs | 2 +- test_streams/test_client/src/main.rs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs b/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs index 02b78fe3..5a155741 100644 --- a/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs +++ b/dl_instance/distributor/distributor/src/distributor/distributors/mod.rs @@ -129,10 +129,12 @@ impl DarkLightDistributor { let ri = ReceiveInfo::get_from_message_string(read.clone()); if ri.rdid == self.info.id { + println!("for a local user"); self.local_pending_messages.insert(ri.rid, PendingMessage::new(true, self.info.id, read.clone())); continue; } else { for j in 0..self.tcp_distributors.len() { + println!("indexing"); if self.tcp_distributors[j].info.id == ri.rdid { self.tcp_distributor_write(j, read.clone()); } diff --git a/dlwp/src/message.rs b/dlwp/src/message.rs index 681c1205..b202c5ca 100644 --- a/dlwp/src/message.rs +++ b/dlwp/src/message.rs @@ -114,7 +114,7 @@ pub fn fmt_message_send(msg: &String) -> String { #[inline] pub fn fmt_message_recv(recv: &String) -> String { let split_first = recv.split(MSG_INIT).collect::>(); - if split_first.len() != 2 { + if split_first.len() < 2 { return recv.clone(); } diff --git a/test_streams/test_client/src/main.rs b/test_streams/test_client/src/main.rs index 229c569b..231d14ed 100644 --- a/test_streams/test_client/src/main.rs +++ b/test_streams/test_client/src/main.rs @@ -15,7 +15,7 @@ fn main() { // Add the client/server's ID and the Distributor ID dlwp::stream::StreamType::Client { rid: 9711410197108107101, - rdid: 4, + rdid: 3, port: 5000, }, false,