feat: support port range

Author: MMitsuha

src/cli.rs

@@ -1,6 +1,7 @@
-use clap::{Parser, Subcommand};
+use anyhow::{Result, bail};
+use clap::{Args, Parser, Subcommand};
 use ipnet::IpNet;
-use std::net::IpAddr;
+use std::{collections::HashSet, net::IpAddr};
 
 #[derive(Parser)]
 pub struct Arg {
@@ -14,20 +15,43 @@ pub enum Command {
     ListInterfaces,
 }
 
-#[derive(Parser)]
+#[derive(Args)]
 pub struct TcpSynArg {
     #[arg(long)]
     pub src_ip: Option<IpAddr>,
 
     #[arg(long, required = true, value_delimiter = ',')]
     pub dest_ips: Vec<IpNet>,
 
-    #[arg(long, required = true, value_delimiter = ',')]
-    pub dest_ports: Vec<u16>,
+    // use std::vec::Vec<u16> here
+    // https://github.com/clap-rs/clap/issues/4679
+    #[arg(long, required = true, value_parser = parse_range)]
+    pub dest_ports: std::vec::Vec<u16>,
 
     #[arg(short, long)]
     pub if_index: Option<u32>,
 
     #[arg(short, long, default_value_t = 5)]
     pub thread: usize,
 }
+
+fn parse_range(s: &str) -> Result<Vec<u16>> {
+    let mut result = HashSet::new();
+
+    for part in s.split(',') {
+        if let Some((start, end)) = part.split_once('-') {
+            let start = start.trim().parse::<u16>()?;
+            let end = end.trim().parse::<u16>()?;
+
+            if start > end {
+                bail!("bad range: {}", part);
+            }
+
+            result.extend(start..=end);
+        } else {
+            result.insert(part.trim().parse::<u16>()?);
+        }
+    }
+
+    Ok(result.into_iter().collect())
+}

src/main.rs

@@ -107,8 +107,11 @@ async fn tcp_syn(arg: TcpSynArg) -> Result<()> {
     let count = dest_ips.len() * dest_ports.len();
 
     info!(
-        "start tcp syn scan, if_index: {}, src_ip: {}, dest_ips: {:?}, dest_ports: {:?}",
-        if_index, src_ip, dest_ips, dest_ports
+        "start tcp syn scan, if_index: {}, src_ip: {}, dest_ips: {:?}, number of dest_ports: {}",
+        if_index,
+        src_ip,
+        arg.dest_ips,
+        dest_ports.len()
     );
 
     let (progress, progress_tx) = Progress::new(count);