seb/number-station
1
0
Fork 0
forked from sigil-03/number-station
Code Pull requests Activity

consolidate construction of the Transport in main()

Browse source
This commit is contained in:
Sebastian Kuzminsky 2025-12-01 21:56:25 -07:00
parent 4bcc454d5b
commit 54188e177a
1 changed files with 14 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main.rs
View file

@ -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,
}
}