From 54188e177aaa81b23d2102c115a1835e507afac0 Mon Sep 17 00:00:00 2001
From: Sebastian Kuzminsky <seb@scytherobotics.com>
Date: Mon, 1 Dec 2025 21:56:25 -0700
Subject: [PATCH] consolidate construction of the Transport in main()

---
 src/main.rs | 36 ++++++++++++++----------------------
 1 file changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 9bd093f..d5a4490 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -71,17 +71,8 @@ struct Cli {
     tcp_client: String,
 }
 
-async fn run_client(tcp_client: String) {
+async fn run_client(transport: &mut reticulum::transport::Transport) {
     log::info!(">>> NUMBER STATION CLIENT <<<");
-    let mut transport = Transport::new(TransportConfig::default());
-
-    let client_addr = transport
-        .iface_manager()
-        .lock()
-        .await
-        .spawn(TcpClient::new(tcp_client), TcpClient::spawn);
-
-    log::info!("client ID: {}", client_addr);
 
     // let id = PrivateIdentity::new_from_rand(OsRng);
     let id = PrivateIdentity::new_from_name("test-name");
@@ -125,17 +116,8 @@ async fn run_client(tcp_client: String) {
     }
 }
 
-async fn run_server() {
+async fn run_server(transport: &mut reticulum::transport::Transport) {
     log::info!(">>> NUMBER STATION SERVER <<<");
-    let mut transport = Transport::new(TransportConfig::default());
-
-    let client_addr = transport
-        .iface_manager()
-        .lock()
-        .await
-        .spawn(TcpClient::new("127.0.0.1:4242"), TcpClient::spawn);
-
-    log::info!("client ID: {}", client_addr);
 
     let id = PrivateIdentity::new_from_rand(OsRng);
     // let id = PrivateIdentity::new_from_name("test-name");
@@ -194,8 +176,18 @@ async fn main() {
 
     let cli = Cli::parse();
 
+    let mut transport = Transport::new(TransportConfig::default());
+
+    let client_addr = transport
+        .iface_manager()
+        .lock()
+        .await
+        .spawn(TcpClient::new(cli.tcp_client), TcpClient::spawn);
+
+    log::info!("client ID: {}", client_addr);
+
     match cli.mode {
-        Mode::Receiver => run_client(cli.tcp_client).await,
-        Mode::Generator => run_server().await,
+        Mode::Receiver => run_client(&mut transport).await,
+        Mode::Generator => run_server(&mut transport).await,
     }
 }