Sqaushed the 4 commits

fujiapple852 · Nov 13, 2023 · 24e953e · 24e953e
1 parent f6e82dc
commit 24e953e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -435,10 +435,10 @@ impl TryFrom<(Args, &Platform)> for TrippyConfig {
             constants::DEFAULT_REPORT_CYCLES,
         );
         let geoip_mmdb_file = cfg_layer_opt(args.geoip_mmdb_file, cfg_file_tui.geoip_mmdb_file);
-        let protocol = match (args.udp, args.tcp, protocol) {
-            (false, false, Protocol::Icmp) => TracerProtocol::Icmp,
-            (false, false, Protocol::Udp) | (true, _, _) => TracerProtocol::Udp,
-            (false, false, Protocol::Tcp) | (_, true, _) => TracerProtocol::Tcp,
+        let protocol = match (args.udp, args.tcp, args.icmp, protocol) {
+            (false, false, false, Protocol::Udp) | (true, _, _, _) => TracerProtocol::Udp,
+            (false, false, false, Protocol::Tcp) | (_, true, _, _) => TracerProtocol::Tcp,
+            (false, false, false, Protocol::Icmp) | (_, _, true, _) => TracerProtocol::Icmp,
         };
         let read_timeout = humantime::parse_duration(&read_timeout)?;
         let min_round_duration = humantime::parse_duration(&min_round_duration)?;

diff --git a/src/config/cmd.rs b/src/config/cmd.rs
@@ -34,13 +34,32 @@ pub struct Args {
     pub protocol: Option<Protocol>,
 
     /// Trace using the UDP protocol
-    #[arg(long, conflicts_with = "protocol", conflicts_with = "tcp")]
+    #[arg(
+        long,
+        conflicts_with = "protocol",
+        conflicts_with = "tcp",
+        conflicts_with = "icmp"
+    )]
     pub udp: bool,
 
     /// Trace using the TCP protocol
-    #[arg(long, conflicts_with = "protocol", conflicts_with = "udp")]
+    #[arg(
+        long,
+        conflicts_with = "protocol",
+        conflicts_with = "udp",
+        conflicts_with = "icmp"
+    )]
     pub tcp: bool,
 
+    /// Trace using the ICMP protocol
+    #[arg(
+        long,
+        conflicts_with = "protocol",
+        conflicts_with = "udp",
+        conflicts_with = "tcp"
+    )]
+    pub icmp: bool,
+
     /// Use IPv4 only
     #[arg(short = '4', long, conflicts_with = "ipv6")]
     pub ipv4: bool,