Make netclient work against mrefd

[m17rt] / tools / m17rt-netclient / src / main.rs

diff --git a/tools/m17rt-netclient/src/main.rs b/tools/m17rt-netclient/src/main.rs
index 9b65e1bfbe8c5a62a93d8e5f445fb173bd90c1c6..3204b5bbb0941b492ee0eacb27ffdbc3f0b2c25d 100644 (file)
--- a/tools/m17rt-netclient/src/main.rs
+++ b/tools/m17rt-netclient/src/main.rs
@@ -34,6 +34,14 @@ fn main() {
                 .required(true)
                 .help("Your callsign for reflector registration and transmissions"),
         )
                 .required(true)
                 .help("Your callsign for reflector registration and transmissions"),
         )

+        .arg(
+            Arg::new("reflector")
+                .long("reflector")
+                .short('r')
+                .value_parser(valid_callsign)
+                .required(true)
+                .help("Reflector designator/callsign, often starting with 'M17-'"),
+        )

         .arg(
             Arg::new("module")
                 .long("module")
         .arg(
             Arg::new("module")
                 .long("module")


@@ -59,11 +67,20 @@ fn main() {
     let hostname = args.get_one::<String>("hostname").unwrap();
     let port = args.get_one::<u16>("port").unwrap();
     let callsign = args.get_one::<M17Address>("callsign").unwrap();
     let hostname = args.get_one::<String>("hostname").unwrap();
     let port = args.get_one::<u16>("port").unwrap();
     let callsign = args.get_one::<M17Address>("callsign").unwrap();

+    let reflector = args.get_one::<M17Address>("reflector").unwrap();

     let module = args.get_one::<char>("module").unwrap();
     let input = args.get_one::<String>("input");
     let output = args.get_one::<String>("output");
 
     let module = args.get_one::<char>("module").unwrap();
     let input = args.get_one::<String>("input");
     let output = args.get_one::<String>("output");
 

-    let mut tx = Codec2TxAdapter::new(callsign.clone(), M17Address::new_broadcast());
+    let ref_with_mod = format!("{} {}", reflector, module);
+    let Ok(reflector) = M17Address::from_callsign(&ref_with_mod) else {
+        println!(
+            "Unable to create valid destination address for reflector + callsign '{ref_with_mod}'"
+        );
+        std::process::exit(1);
+    };
+
+    let mut tx = Codec2TxAdapter::new(callsign.clone(), reflector);

     if let Some(input) = input {
         tx.set_input_card(input);
     }
     if let Some(input) = input {
         tx.set_input_card(input);
     }


@@ -117,7 +134,7 @@ struct ConsoleAdapter;
 impl StreamAdapter for ConsoleAdapter {
     fn stream_began(&self, link_setup: m17app::link_setup::LinkSetup) {
         println!(
 impl StreamAdapter for ConsoleAdapter {
     fn stream_began(&self, link_setup: m17app::link_setup::LinkSetup) {
         println!(

-            "Transmission begins. From: {} To: {}",
+            "Incoming transmission begins. From: {} To: {}",

             link_setup.source(),
             link_setup.destination()
         );
             link_setup.source(),
             link_setup.destination()
         );


@@ -125,7 +142,7 @@ impl StreamAdapter for ConsoleAdapter {
 
     fn stream_data(&self, _frame_number: u16, is_final: bool, _data: Arc<[u8; 16]>) {
         if is_final {
 
     fn stream_data(&self, _frame_number: u16, is_final: bool, _data: Arc<[u8; 16]>) {
         if is_final {

-            println!("Transmission ends.");
+            println!("Incoming transmission ends.");

         }
     }
 }
         }
     }
 }