Fix host identity detection for NetBIOS-truncated hostnames
Unraid truncates the Server Name to 15 chars (NetBIOS limit). HOST2's real hostname is "unRAID-Jayred36" but master.conf's HOST2 (matching what Tailscale shows for this peer, since resolve_tailscale_ip() keys off the same value) is the untruncated "unRAID-Jayred365" — confirmed live, Tailscale's own Self.HostName on that machine is truncated too. vv_detect_host() did a strict case-insensitive match against the bare `hostname -s` output with no tolerance for this, so it always returned 'unknown' on HOST2. That silently broke the first-run wizard (Varaverk.page explicitly excludes 'unknown' from the "needs setup" check) even though host2.conf never existed, plus vv_partner_state() and vv_fallback_active() in monitor.php which independently reimplemented the same hostname comparison instead of calling vv_detect_host(). Fix: vv_detect_host() falls back to a prefix match when the local hostname is exactly 15 chars; vv_partner_state()/vv_fallback_active() now call vv_detect_host() instead of duplicating the comparison. Verified live on HOST2 — vv_detect_host() now returns 'host2', partner state correctly flags HOST2 as is_me, and the wizard-trigger condition now evaluates true.
This commit is contained in:
@@ -171,6 +171,16 @@ function vv_detect_host(): string {
|
||||
foreach ($m[1] as $i => $key) {
|
||||
if (strcasecmp($hostname, trim($m[2][$i])) === 0) return strtolower($key);
|
||||
}
|
||||
// Unraid truncates the Server Name to 15 chars (NetBIOS limit). If the live hostname
|
||||
// is at that exact limit, the name configured in master.conf (matching what Tailscale
|
||||
// shows for this peer — resolve_tailscale_ip() keys off the same value) may be a longer,
|
||||
// untruncated version. Treat a same-prefix match as this host rather than 'unknown'.
|
||||
if (strlen($hostname) === 15) {
|
||||
foreach ($m[1] as $i => $key) {
|
||||
$configured = trim($m[2][$i]);
|
||||
if (strlen($configured) > 15 && stripos($configured, $hostname) === 0) return strtolower($key);
|
||||
}
|
||||
}
|
||||
return 'unknown';
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user