From 9d712ddd10fc47cb1882a5ffd6cdf9ec6fa6a8d9 Mon Sep 17 00:00:00 2001 From: TudbuT Date: Thu, 28 Dec 2023 01:16:24 +0100 Subject: [PATCH] make modem init a file --- src/client.rs | 6 +++++- src/main.rs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/client.rs b/src/client.rs index dc9ef4c..e99b7c9 100644 --- a/src/client.rs +++ b/src/client.rs @@ -1,6 +1,7 @@ use core::panic; use std::{ collections::HashMap, + fs, io::{Read, Write}, net::TcpStream, thread, @@ -41,7 +42,10 @@ fn connect(params: &ClientParams) -> Connection { .unwrap(); if let Some(modem_init) = params.modem_init { serial.set_timeout(Duration::from_millis(200)).unwrap(); - for line in modem_init.lines() { + for line in fs::read_to_string(modem_init) + .expect("invalid modem init file") + .lines() + { let line = line .replace("$IP", ¶ms.server_ip.to_string()) .replace("$PORT", ¶ms.server_port.to_string()); diff --git a/src/main.rs b/src/main.rs index fde1010..97b4f74 100644 --- a/src/main.rs +++ b/src/main.rs @@ -31,5 +31,5 @@ fn main() { } eprintln!("Usage: \n\ \x20 revpfw3 server []\n\ - \x20 revpfw3 client [ [ ]]"); + \x20 revpfw3 client [ [ ]]"); }