Print associated interfaces for ::-listens

Author: jcaesar

README.md

@@ -39,9 +39,9 @@ avahi-daemon (pid 655 user avahi)
  * Explaining wireguard and vxlan listening ports
 
 More specifically
- * `ss` has a nice short command, but then you need a lot of arguments. But which? `-lpunt`? (Though of course, `ss` can do things `lls` can't, like printing established connections or unix sockets.)
+ * `ss` has a nice short command, but then you need a lot of arguments. `-plut0wn` maybe? (Though of course, `ss` can do things `lls` can't, like printing established connections or unix sockets.)
  * `ss` output requires ~160 columns, while `lls` makes do with ~60.
  * `ss` output order is unfathomable.
- * For interpreters, `ss` will just display the command name, e.g. `python` or `node`.
+ * `ss` will just display the command name, e.g. `python` or `node`, but not what script is running.
    `lls` tries to parse the command line of the interpreters and display the script name where possible.
  * `ss` prints almost no information for listening ports belonging to WireGuard or VXLAN interfaces, and what it prints is more confusing than helpful.

src/main.rs

@@ -7,7 +7,7 @@ mod termtree;
 use anyhow::Result;
 use itertools::Itertools;
 use netlink::{
-    sock::{Family, SockInfo},
+    sock::{Family, IfaceName, SockInfo},
     wg::wireguards,
 };
 use procfs::process::all_processes;
@@ -176,12 +176,9 @@ fn sockets_tree<'a>(
     }
     for ((port, proto), socks) in groups {
         let mut sout = termtree::Tree::new();
-        if socks.iter().map(|s| s.addr).sorted().collect::<Vec<_>>()
-            == [
-                IpAddr::V4(Ipv4Addr::UNSPECIFIED),
-                IpAddr::V6(Ipv6Addr::UNSPECIFIED),
-            ]
-        {
+        let v4all = IpAddr::V4(Ipv4Addr::UNSPECIFIED);
+        let v6all = IpAddr::V6(Ipv6Addr::UNSPECIFIED);
+        if socks.iter().map(|s| s.addr).sorted().collect::<Vec<_>>() == [v4all, v6all] {
             sout.leaf("0.0.0.0 + ::".into());
         } else {
             let socks = socks
@@ -191,9 +188,13 @@ fn sockets_tree<'a>(
                 .collect::<BTreeSet<_>>();
             for (family, addr, iface) in socks {
                 match (family, iface) {
-                    (Family::Both, _) => sout.leaf("*".into()),
-                    (_, Some(ifname)) => sout.leaf(format!("{} ({ifname})", addr)),
-                    _ => sout.leaf(format!("{}", addr)),
+                    (Family::Both, IfaceName::None) if addr == v6all => sout.leaf("*".into()),
+                    (Family::Both, IfaceName::Associated(ifnam)) if addr == v6all => {
+                        sout.leaf(format!("*%{ifnam}"))
+                    }
+                    (_, IfaceName::Associated(ifnam)) => sout.leaf(format!("{addr}%{ifnam}")),
+                    (_, IfaceName::LocalRoute(ifnam)) => sout.leaf(format!("{addr} ({ifnam})")),
+                    (_, IfaceName::None) => sout.leaf(format!("{}", addr)),
                 };
             }
         }

src/netlink/sock.rs

@@ -152,6 +152,13 @@ impl std::str::FromStr for Protocol {
     }
 }
 
+#[derive(Debug, PartialEq, Eq, Clone, Ord, PartialOrd, Copy)]
+pub enum IfaceName<'a> {
+    None,
+    Associated(&'a str),
+    LocalRoute(&'a str),
+}
+
 #[derive(Debug, PartialEq, Eq, Clone)]
 pub struct SockInfo<'a> {
     pub family: Family,
@@ -160,7 +167,7 @@ pub struct SockInfo<'a> {
     pub addr: IpAddr,
     pub uid: u32,
     pub ino: Ino,
-    pub iface: Option<&'a str>,
+    pub iface: IfaceName<'a>,
 }
 impl<'a> SockInfo<'a> {
     fn new(
@@ -180,22 +187,24 @@ impl<'a> SockInfo<'a> {
             family
         };
         let addr = ir.header.socket_id.source_address;
-        let iface = interfaces
-            .get(&ir.header.socket_id.interface_id)
-            .or_else(|| {
-                local_routes
-                    .route(addr)
-                    .and_then(|iface| interfaces.get(&iface))
-            })
-            .map(|x| &**x);
+        let iface = match ir.header.socket_id.interface_id {
+            1.. => interfaces
+                .get(&ir.header.socket_id.interface_id)
+                .map(|x| IfaceName::Associated(&**x)),
+            0 => local_routes
+                .route(addr)
+                .and_then(|iface| interfaces.get(&iface))
+                .map(|x| IfaceName::LocalRoute(&**x)),
+        };
+        // .map(|x| &**x);
         Self {
             family,
             protocol,
             port: ir.header.socket_id.source_port,
             addr,
             uid: ir.header.uid,
             ino: ir.header.inode.into(),
-            iface,
+            iface: iface.unwrap_or(IfaceName::None),
         }
     }
 }

src/sockets_procfs.rs

@@ -1,7 +1,7 @@
 use super::Ino;
 use crate::{
     netlink::sock::{Family, Protocol, SockInfo},
-    IfaceInfo,
+    IfaceInfo, IfaceName,
 };
 use anyhow::{Context, Result};
 use std::collections::HashMap;
@@ -39,7 +39,8 @@ pub fn all_sockets<'i>(
                                     iface: local_routes
                                         .route(s.local_address.ip())
                                         .and_then(|iface| interfaces.get(&iface))
-                                        .map(|s| &**s),
+                                        .map(|s| IfaceName::LocalRoute(&**s))
+                                        .unwrap_or(IfaceName::None),
                                 },
                             );
                         }