Browse Source

allow configurable server address:port

Justin Tracey 1 year ago
parent
commit
2993ba3a44
3 changed files with 11 additions and 7 deletions
  1. 1 2
      src/bin/client.rs
  2. 1 2
      src/bin/peer.rs
  3. 9 3
      src/bin/server.rs

+ 1 - 2
src/bin/client.rs

@@ -3,7 +3,6 @@
 use mgen::{MessageHeader, SerializedMessage};
 use rand_xoshiro::{rand_core::SeedableRng, Xoshiro256PlusPlus};
 use serde::Deserialize;
-use std::env;
 use std::result::Result;
 use tokio::io::AsyncWriteExt;
 use tokio::net::tcp::{OwnedReadHalf, OwnedWriteHalf};
@@ -243,7 +242,7 @@ struct Config {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = env::args();
+    let mut args = std::env::args();
     let _ = args.next();
     let mut handles = vec![];
     for config_file in args {

+ 1 - 2
src/bin/peer.rs

@@ -3,7 +3,6 @@ use mgen::{log, MessageHeader, SerializedMessage};
 use rand_xoshiro::{rand_core::SeedableRng, Xoshiro256PlusPlus};
 use serde::Deserialize;
 use std::collections::HashMap;
-use std::env;
 use std::result::Result;
 use std::sync::Arc;
 use tokio::io::AsyncWriteExt;
@@ -341,7 +340,7 @@ struct Config {
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
-    let mut args = env::args();
+    let mut args = std::env::args();
     let _ = args.next();
 
     struct ForIoThreads {

+ 9 - 3
src/bin/server.rs

@@ -16,9 +16,15 @@ type ID = String;
 
 #[tokio::main]
 async fn main() -> Result<(), Box<dyn Error>> {
-    let listener = TcpListener::bind("127.0.0.1:6397").await?;
-
-    log!("Listening");
+    let args: Vec<String> = std::env::args().collect();
+    let listen_addr = if args.len() > 1 {
+        &args[1]
+    } else {
+        "127.0.0.1:6397"
+    };
+    let listener = TcpListener::bind(listen_addr).await?;
+
+    log!("Listening on {}", listen_addr);
 
     let snd_db = Arc::new(RwLock::new(HashMap::<
         ID,