fujiapple852 · fujiapple852 · Nov 11, 2023 · Nov 11, 2023 · Nov 11, 2023 · Nov 9, 2023
diff --git a/src/backend/flows.rs b/src/backend/flows.rs
@@ -1,5 +1,6 @@
 use derive_more::{Add, AddAssign, Sub, SubAssign};
 use itertools::{EitherOrBoth, Itertools};
+use std::fmt::{Debug, Display, Formatter};
 use std::net::IpAddr;
 
 /// Identifies a tracing `Flow`.
@@ -20,6 +21,12 @@ use std::net::IpAddr;
 )]
 pub struct FlowId(pub u64);
 
+impl Display for FlowId {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
 /// A register of tracing `Flows`.
 #[derive(Debug, Clone, Default)]
 pub struct FlowRegistry {
@@ -34,7 +41,7 @@ impl FlowRegistry {
     pub fn new() -> Self {
         Self {
             flows: Vec::new(),
-            next_flow_id: FlowId(0),
+            next_flow_id: FlowId(1),
         }
     }
 
@@ -152,6 +159,12 @@ impl Flow {
     }
 }
 
+impl Display for Flow {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.entries.iter().format(", "))
+    }
+}
+
 /// The result of a `Flow` comparison check.
 #[derive(Debug, Clone, Copy, Eq, PartialEq)]
 pub enum CheckStatus {
@@ -172,6 +185,17 @@ pub enum FlowEntry {
     Known(IpAddr),
 }
 
+impl Display for FlowEntry {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        match self {
+            Self::Unknown => f.write_str("*"),
+            Self::Known(addr) => {
+                write!(f, "{addr}")
+            }
+        }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -183,9 +207,9 @@ mod tests {
         let mut registry = FlowRegistry::new();
         let flow1 = Flow::from_hops([addr("1.1.1.1")]);
         let flow_id = registry.register(flow1);
-        assert_eq!(FlowId(0), flow_id);
+        assert_eq!(FlowId(1), flow_id);
         assert_eq!(
-            &[(Flow::from_hops([addr("1.1.1.1")]), FlowId(0))],
+            &[(Flow::from_hops([addr("1.1.1.1")]), FlowId(1))],
             registry.flows()
         );
     }
@@ -197,8 +221,8 @@ mod tests {
         let flow1_id = registry.register(flow1.clone());
         let flow2 = Flow::from_hops([addr("2.2.2.2")]);
         let flow2_id = registry.register(flow2.clone());
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(1), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(2), flow2_id);
         assert_eq!(&[(flow1, flow1_id), (flow2, flow2_id)], registry.flows());
     }
 
@@ -209,8 +233,8 @@ mod tests {
         let flow1_id = registry.register(flow1.clone());
         let flow2 = Flow::from_hops([addr("1.1.1.1")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
         assert_eq!(&[(flow1, flow1_id)], registry.flows());
     }
 
@@ -223,9 +247,9 @@ mod tests {
         let flow2_id = registry.register(flow2.clone());
         let flow3 = Flow::from_hops([addr("1.1.1.1")]);
         let flow3_id = registry.register(flow3);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(1), flow2_id);
-        assert_eq!(FlowId(0), flow3_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(2), flow2_id);
+        assert_eq!(FlowId(1), flow3_id);
         assert_eq!(&[(flow1, flow1_id), (flow2, flow2_id)], registry.flows());
     }
 
@@ -242,11 +266,11 @@ mod tests {
         let flow4_id = registry.register(flow4);
         let flow5 = Flow::from_hops([addr("1.1.1.1")]);
         let flow5_id = registry.register(flow5);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
-        assert_eq!(FlowId(0), flow3_id);
-        assert_eq!(FlowId(1), flow4_id);
-        assert_eq!(FlowId(0), flow5_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
+        assert_eq!(FlowId(1), flow3_id);
+        assert_eq!(FlowId(2), flow4_id);
+        assert_eq!(FlowId(1), flow5_id);
     }
 
     #[test]
@@ -260,10 +284,10 @@ mod tests {
         let flow3_id = registry.register(flow3);
         let flow4 = Flow::from_hops([addr("1.1.1.1"), addr("2.2.2.2"), addr("3.3.3.3")]);
         let flow4_id = registry.register(flow4);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
-        assert_eq!(FlowId(0), flow3_id);
-        assert_eq!(FlowId(0), flow4_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
+        assert_eq!(FlowId(1), flow3_id);
+        assert_eq!(FlowId(1), flow4_id);
     }
 
     #[test]
@@ -286,10 +310,10 @@ mod tests {
         // still matches flow 1
         let flow4 = Flow::from_hops([addr("2.2.2.2")]);
         let flow4_id = registry.register(flow4);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(1), flow2_id);
-        assert_eq!(FlowId(0), flow3_id);
-        assert_eq!(FlowId(1), flow4_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(2), flow2_id);
+        assert_eq!(FlowId(1), flow3_id);
+        assert_eq!(FlowId(2), flow4_id);
     }
 
     #[test]
@@ -299,8 +323,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([addr("1.1.1.1")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
     }
 
     #[test]
@@ -310,8 +334,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([addr("1.1.1.1"), None]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
     }
 
     #[test]
@@ -321,8 +345,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([addr("1.1.1.1"), addr("2.2.2.2")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
     }
 
     #[test]
@@ -332,8 +356,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([addr("1.1.1.1"), addr("2.2.2.2")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
     }
 
     #[test]
@@ -343,8 +367,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([None, addr("1.1.1.1")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(0), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(1), flow2_id);
     }
 
     #[test]
@@ -354,8 +378,8 @@ mod tests {
         let flow1_id = registry.register(flow1);
         let flow2 = Flow::from_hops([None, addr("2.2.2.2")]);
         let flow2_id = registry.register(flow2);
-        assert_eq!(FlowId(0), flow1_id);
-        assert_eq!(FlowId(1), flow2_id);
+        assert_eq!(FlowId(1), flow1_id);
+        assert_eq!(FlowId(2), flow2_id);
     }
 
     #[allow(clippy::unnecessary_wraps)]

diff --git a/src/config.rs b/src/config.rs
@@ -47,6 +47,8 @@ pub enum Mode {
     Json,
     /// Generate a Graphviz DOT file for N cycles.
     Dot,
+    /// Display all flows.
+    Flows,
     /// Do not generate any tracing output for N cycles.
     Silent,
 }
@@ -500,9 +502,13 @@ impl TryFrom<(Args, &Platform)> for TrippyConfig {
         let dns_timeout = humantime::parse_duration(&dns_timeout)?;
         let max_rounds = match mode {
             Mode::Stream | Mode::Tui => None,
-            Mode::Pretty | Mode::Markdown | Mode::Csv | Mode::Json | Mode::Dot | Mode::Silent => {
-                Some(report_cycles)
-            }
+            Mode::Pretty
+            | Mode::Markdown
+            | Mode::Csv
+            | Mode::Json
+            | Mode::Dot
+            | Mode::Flows
+            | Mode::Silent => Some(report_cycles),
         };
         let tui_max_addrs = match tui_max_addrs {
             Some(n) if n > 0 => Some(n),

diff --git a/src/main.rs b/src/main.rs
@@ -209,6 +209,7 @@ fn run_frontend(
         Mode::Pretty => report::run_report_table_pretty(&traces[0], args.report_cycles, &resolver)?,
         Mode::Markdown => report::run_report_table_md(&traces[0], args.report_cycles, &resolver)?,
         Mode::Dot => report::run_report_dot(&traces[0], args.report_cycles)?,
+        Mode::Flows => report::run_report_flows(&traces[0], args.report_cycles)?,
         Mode::Silent => report::run_report_silent(&traces[0], args.report_cycles)?,
     }
     Ok(())

diff --git a/src/report.rs b/src/report.rs
@@ -309,6 +309,16 @@ pub fn run_report_dot(info: &TraceInfo, report_cycles: usize) -> anyhow::Result<
     Ok(())
 }
 
+/// Run a trace and report all flows observed.
+pub fn run_report_flows(info: &TraceInfo, report_cycles: usize) -> anyhow::Result<()> {
+    wait_for_round(&info.data, report_cycles)?;
+    let trace = info.data.read().clone();
+    for (flow, flow_id) in trace.flows() {
+        println!("flow {flow_id}: {flow}");
+    }
+    Ok(())
+}
+
 /// Block until trace data for round `round` is available.
 fn wait_for_round(trace_data: &Arc<RwLock<Trace>>, report_cycles: usize) -> anyhow::Result<Trace> {
     let mut trace = trace_data.read().clone();

diff --git a/trippy-config-sample.toml b/trippy-config-sample.toml
@@ -30,6 +30,7 @@
 #   csv         - Generate a CSV report for N cycles
 #   json        - Generate a JSON report for N cycles
 #   dot         - Generate a Graphviz DOT report for N cycles
+#   flows       - Display all flows
 #   silent      - Do not generate any output for N cycles
 mode = "tui"