dearsky/numa
1
0
Fork 0
Code Issues 10 Pull Requests 1 Actions Packages Projects Releases 25 Wiki Activity

refactor: collapse port53 advisory to single flat path

Browse Source 
The per-platform cause sentences were cosmetic — they didn't change
the user's actions (install, or bind_addr on a non-privileged port),
but they introduced duplicated "another process..." strings, a
dead-from-CI branch (is_systemd_resolved_active() == true is never
reached by any test), and a pub visibility bump on
is_systemd_resolved_active for a single caller.

Replace with one flat format! whose cause line mentions both
systemd-resolved and the Windows DNS Client inline. The existing
smoke test now exercises 100% of the function.

is_systemd_resolved_active reverts to private.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
Razvan Dimescu
2026-04-09 14:31:26 +03:00
parent 7ddf54055d
commit 49f4d29800
1 changed files with 23 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/system_dns.rs
View File

@@ -56,58 +56,37 @@ pub fn is_port_53(bind_addr: &str) -> bool {
.unwrap_or(false)
}
/// Human-readable diagnostic for port-53 bind conflicts. Explains the
/// likely cause on the current platform and offers two concrete fixes:
/// install Numa as the system resolver, or test on a non-privileged port.
/// Human-readable diagnostic for port-53 bind conflicts. Offers two
/// concrete fixes: install Numa as the system resolver, or bind to a
/// non-privileged port.
pub fn port53_conflict_advisory(bind_addr: &str) -> String {
let o = "\x1b[1;38;2;192;98;58m"; // bold orange
let r = "\x1b[0m";
let mut msg = format!(
"\n{o}Numa{r} — cannot bind to {}: port 53 is already in use.\n\n",
bind_addr
);
format!(
"
{o}Numa{r} — cannot bind to {bind_addr}: port 53 is already in use.
#[cfg(target_os = "linux")]
{
if is_systemd_resolved_active() {
msg.push_str(
" systemd-resolved is holding port 53 via its stub listener\n \
(127.0.0.53:53), which blocks bind(0.0.0.0:53) on Linux.\n\n",
);
} else {
msg.push_str(
" Another process is holding port 53 on this host.\n \
Check with: sudo ss -lntu 'sport = :53'\n\n",
);
}
}
Another process is already bound to port 53. On Linux this is
typically systemd-resolved; on Windows, the DNS Client service.
#[cfg(windows)]
{
msg.push_str(" Windows DNS Client (Dnscache) holds port 53 at the kernel level.\n\n");
}
Fix — pick one:
#[cfg(not(any(target_os = "linux", windows)))]
{
msg.push_str(" Another process on this host is already bound to port 53.\n\n");
}
1. Install Numa as the system resolver (frees port 53):
msg.push_str(" Fix — pick one:\n\n");
msg.push_str(" 1. Install Numa as the system resolver (frees port 53):\n");
#[cfg(windows)]
msg.push_str(" numa install (run as Administrator)\n\n");
#[cfg(not(windows))]
msg.push_str(" sudo numa install\n\n");
sudo numa install (on Windows, run as Administrator)
msg.push_str(" 2. Test without privileges on a non-standard port.\n");
msg.push_str(" Create ~/.config/numa/numa.toml with:\n\n");
msg.push_str(" [server]\n");
msg.push_str(" bind_addr = \"127.0.0.1:5354\"\n");
msg.push_str(" api_port = 5380\n\n");
msg.push_str(" Then run: numa\n");
msg.push_str(" Test with: dig @127.0.0.1 -p 5354 example.com\n\n");
2. Run on a non-privileged port for testing.
Create ~/.config/numa/numa.toml with:
msg
[server]
bind_addr = \"127.0.0.1:5354\"
api_port = 5380
Then run: numa
Test with: dig @127.0.0.1 -p 5354 example.com
"
)
}
#[cfg(target_os = "macos")]
@@ -1258,7 +1237,7 @@ fn backup_path_linux() -> std::path::PathBuf {
}
#[cfg(target_os = "linux")]
pub fn is_systemd_resolved_active() -> bool {
fn is_systemd_resolved_active() -> bool {
std::process::Command::new("systemctl")
.args(["is-active", "--quiet", "systemd-resolved"])
.status()