From a9d0101a588cffefb90601caf4e3ed2a9fe48a17 Mon Sep 17 00:00:00 2001
From: Michel de Graaf <michel@re-invention.nl>
Date: Sun, 2 Nov 2025 19:57:56 +0100
Subject: [PATCH] fix: correct listening port

---
 src/client.rs | 51 ++++++++++++++++++++++++++-------------------------
 src/server.rs |  5 ++++-
 2 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index 6c7a1df..1e99540 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -120,33 +120,34 @@ impl Client {
 
         let client_sender = sender.clone();
 
-        self.server = match Server::new(self.address.clone(), sender) {
-            Ok(server) => {
-                info!(
-                    "Connected to server at {}:{}",
-                    server.get_address().get_host(),
-                    server.get_address().get_port()
-                );
+        self.server =
+            match Server::new(self.address.clone(), sender, self.listen_port) {
+                Ok(server) => {
+                    info!(
+                        "Connected to server at {}:{}",
+                        server.get_address().get_host(),
+                        server.get_address().get_port()
+                    );
 
-                thread::spawn(move || {
-                    Listen::start(listen_port, client_sender.clone());
-                });
-                let mut unlocked_context = self.context.write().unwrap();
-                unlocked_context.server_sender =
-                    Some(server.get_sender().clone());
+                    thread::spawn(move || {
+                        Listen::start(listen_port, client_sender.clone());
+                    });
+                    let mut unlocked_context = self.context.write().unwrap();
+                    unlocked_context.server_sender =
+                        Some(server.get_sender().clone());
 
-                Self::listen_to_client_operations(
-                    message_reader,
-                    self.context.clone(),
-                    self.username.clone(),
-                );
-                Some(server)
-            }
-            Err(e) => {
-                error!("Error connecting to server: {}", e);
-                None
-            }
-        };
+                    Self::listen_to_client_operations(
+                        message_reader,
+                        self.context.clone(),
+                        self.username.clone(),
+                    );
+                    Some(server)
+                }
+                Err(e) => {
+                    error!("Error connecting to server: {}", e);
+                    None
+                }
+            };
     }
 
     pub fn login(&self) -> Result<bool> {
diff --git a/src/server.rs b/src/server.rs
index add38f0..da7e6a0 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -194,11 +194,13 @@ pub struct Server {
     address: PeerAddress,
     sender: Sender<ServerOperation>,
     context: Arc<RwLock<Context>>,
+    listen_port: u32,
 }
 impl Server {
     pub fn new(
         address: PeerAddress,
         client_channel: Sender<ClientOperation>,
+        listen_port: u32,
     ) -> std::result::Result<Self, io::Error> {
         let (sender, server_channel): (
             Sender<ServerOperation>,
@@ -211,6 +213,7 @@ impl Server {
             address,
             context,
             sender,
+            listen_port,
         };
 
         server.start_read_write_loops(server_channel, client_channel)?;
@@ -473,7 +476,7 @@ impl Server {
             self.queue_message(MessageFactory::build_no_parent_message());
             self.queue_message(MessageFactory::build_set_status_message(2));
             self.queue_message(MessageFactory::build_set_wait_port_message(
-                2235,
+                self.listen_port,
             ));
         }