robinson/connectbox-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow specifying just one port in the range

Browse Source
This commit is contained in:
lemonsh
2023-05-28 21:06:16 +02:00
parent ea6b2a3850
commit f8e210644a
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
connectbox-shell/src/commands/pfw.rs
View File

@ -2,7 +2,7 @@ use std::vec;
use ascii_table::{Align::Right, AsciiTable}; use ascii_table::{Align::Right, AsciiTable};
use color_eyre::Result; use color_eyre::Result;
use color_print::cprintln; use color_print::{cprintln, cprint};
use connectbox::{ use connectbox::{
models::{PortForwardEntry, PortForwardProtocol}, models::{PortForwardEntry, PortForwardProtocol},
PortForwardAction, PortForwardAction,
@ -44,7 +44,7 @@ pub(crate) async fn run(cmd: PortForwardsCommand, state: &AppState) -> Result<()
let rendered_table = PORT_FORWARDING_TABLE let rendered_table = PORT_FORWARDING_TABLE
.get_or_init(init_port_forwarding_table) .get_or_init(init_port_forwarding_table)
.format(table_entries); .format(table_entries);
cprintln!( cprint!(
"<black!>LAN IP: {}\nSubnet mask: {}\n</black!>{rendered_table}", "<black!>LAN IP: {}\nSubnet mask: {}\n</black!>{rendered_table}",
port_forwards.lan_ip, port_forwards.lan_ip,
port_forwards.subnet_mask port_forwards.subnet_mask
@ -130,6 +130,11 @@ pub(crate) async fn run(cmd: PortForwardsCommand, state: &AppState) -> Result<()
} }
fn parse_port_range(s: &str) -> Option<(u16, u16)> { fn parse_port_range(s: &str) -> Option<(u16, u16)> {
let (start, end) = s.split_once('-')?; if let Some((start, end)) = s.split_once('-') {
Some((start.parse().ok()?, end.parse().ok()?)) Some((start.parse().ok()?, end.parse().ok()?))
} else if let Ok(port) = s.parse() {
Some((port, port))
} else {
None
}
} }