From 6dfbaed26009c5a9f7bacdf54e1e7d2a92068886 Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Tue, 20 Aug 2024 21:36:11 +0200 Subject: [PATCH 1/5] Send SearchStarted events with ip addrs again Otherwise the output gets pretty cluttered when running the query example --- src/service_daemon.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service_daemon.rs b/src/service_daemon.rs index 3e8870e..352feed 100644 --- a/src/service_daemon.rs +++ b/src/service_daemon.rs @@ -2038,7 +2038,7 @@ impl Zeroconf { next_delay: u32, listener: Sender, ) { - let addr_list: Vec<_> = self.intf_socks.keys().collect(); + let addr_list: Vec<_> = self.intf_socks.keys().map(|itf| itf.addr.ip()).collect(); if let Err(e) = listener.send(ServiceEvent::SearchStarted(format!( "{} on addrs {:?}", &ty, &addr_list From 4f14d9fb6bb6517306badb6e1ea3a22d852fddf9 Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Wed, 21 Aug 2024 07:40:35 +0200 Subject: [PATCH 2/5] Align other events with the ServiceResolved output --- examples/query.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/query.rs b/examples/query.rs index 30339e6..d595b39 100644 --- a/examples/query.rs +++ b/examples/query.rs @@ -52,7 +52,7 @@ fn main() { } } other_event => { - println!("At {:?} : {:?}", now.elapsed(), &other_event); + println!("At {:?}: {:?}", now.elapsed(), &other_event); } } } From b60cbd1eb311dc5786a6381dbb64e0d604c8852c Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Wed, 21 Aug 2024 07:41:05 +0200 Subject: [PATCH 3/5] Update crate if_addrs to more recent version for having pretty interface names on windows --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index fe9f6a5..d318f52 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ default = ["async", "logging"] [dependencies] flume = { version = "0.11", default-features = false } # channel between threads -if-addrs = { version = "0.10", features = ["link-local"] } # get local IP addresses +if-addrs = { version = "0.13", features = ["link-local"] } # get local IP addresses log = { version = "0.4", optional = true } # logging polling = "2.1" # select/poll sockets socket2 = { version = "0.5.5", features = ["all"] } # socket APIs From a1e98de1279cb31322194dbe6f7f62196f4ca722 Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Wed, 21 Aug 2024 07:41:20 +0200 Subject: [PATCH 4/5] Pretty format interfaces --- src/service_daemon.rs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/service_daemon.rs b/src/service_daemon.rs index 352feed..a52ac25 100644 --- a/src/service_daemon.rs +++ b/src/service_daemon.rs @@ -2038,10 +2038,16 @@ impl Zeroconf { next_delay: u32, listener: Sender, ) { - let addr_list: Vec<_> = self.intf_socks.keys().map(|itf| itf.addr.ip()).collect(); + let pretty_interfaces: Vec = self + .intf_socks + .keys() + .map(|itf| format!("{} ({})", itf.ip(), itf.name)) + .collect(); + if let Err(e) = listener.send(ServiceEvent::SearchStarted(format!( - "{} on addrs {:?}", - &ty, &addr_list + "{} on addrs [{}]", + &ty, + pretty_interfaces.join(", ") ))) { error!( "Failed to send SearchStarted({})(repeating:{}): {}", From 60b542cdbf69eea7b9b3b7932a78e6fe47185f77 Mon Sep 17 00:00:00 2001 From: hrzlgnm Date: Wed, 21 Aug 2024 07:47:46 +0200 Subject: [PATCH 5/5] Rename var --- src/service_daemon.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/service_daemon.rs b/src/service_daemon.rs index a52ac25..aaaf90c 100644 --- a/src/service_daemon.rs +++ b/src/service_daemon.rs @@ -2038,7 +2038,7 @@ impl Zeroconf { next_delay: u32, listener: Sender, ) { - let pretty_interfaces: Vec = self + let pretty_addrs: Vec = self .intf_socks .keys() .map(|itf| format!("{} ({})", itf.ip(), itf.name)) @@ -2047,7 +2047,7 @@ impl Zeroconf { if let Err(e) = listener.send(ServiceEvent::SearchStarted(format!( "{} on addrs [{}]", &ty, - pretty_interfaces.join(", ") + pretty_addrs.join(", ") ))) { error!( "Failed to send SearchStarted({})(repeating:{}): {}",