Print duplicity when deduplicating

Author: jcaesar

src/main.rs

@@ -12,7 +12,7 @@ use netlink::{
 };
 use procfs::process::all_processes;
 use std::{
-    collections::{BTreeMap, BTreeSet, HashMap},
+    collections::{BTreeMap, HashMap},
     env::var_os,
     io::{stdout, BufWriter, Write},
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
@@ -184,16 +184,25 @@ fn sockets_tree<'a>(
         {
             sout.leaf("0.0.0.0 + ::".into());
         } else {
-            let socks = socks
+            let fields = |sock: &SockInfo<'a>| (sock.family, sock.iface, sock.addr);
+            let mut counts = socks
                 .iter()
                 .filter(|sock| filter.accept_addr(sock.addr))
-                .collect::<BTreeSet<_>>();
+                .counts_by(|sock| fields(sock));
             for sock in socks {
-                match (sock.family, sock.iface) {
-                    (Family::Both, _) => sout.leaf("*".into()),
-                    (_, Some(ifname)) => sout.leaf(format!("{} ({ifname})", sock.addr)),
-                    _ => sout.leaf(format!("{}", sock.addr)),
-                };
+                let count = counts.remove(&fields(&*sock));
+                if let Some(count) = count {
+                    let disp = match (sock.family, sock.iface) {
+                        (Family::Both, _) => "*".into(),
+                        (_, Some(ifname)) => format!("{} ({ifname})", sock.addr),
+                        _ => format!("{}", sock.addr),
+                    };
+                    let duplicity = match count {
+                        1 => "".into(),
+                        _ => format!(" (×{count})"),
+                    };
+                    sout.leaf(format!("{disp}{duplicity}"));
+                }
             }
         }
         if filter.accept_port(port) && filter.accept_proto(proto) {

src/netlink/sock.rs

@@ -68,7 +68,7 @@ pub fn all_sockets<'i>(
     Ok(ret)
 }
 
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
 pub enum Family {
     V4,
     V6,