peter/infix
1
0
Fork 0
mirror of https://github.com/kernelkit/infix.git synced 2026-07-22 01:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

netbrowse: fix device detection in default view

Browse Source 
Apple devices (e.g. Apple TV) publish vv=1 in their AirPlay/RAOP TXT
records, causing a false positive with our Infix platform marker.
Tighten the filter to require vv=1 together with at least one management
service type (ssh, https, http, netconf, restconf), which Apple devices
never advertise. Keep on=Infix as a fallback for older firmware that
predates vv=1.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2026-03-09 19:25:26 +01:00
parent 87c671b4cc
commit c68db78309
2 changed files with 44 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/libll.sh
+14 -5
View File
@@ -204,12 +204,13 @@ llscan_mdns()
avahi-browse $flags 2>/dev/null | awk -F';' -v show_all="$all" '
$1 == "=" {
host = $7
host = $7
proto = $3
addr = $8
txt = $10
addr = $8
stype = $5
txt = $10
on = ""; ov = ""; product = ""; devid = ""
on = ""; ov = ""; product = ""; devid = ""; vv = ""
n = split(txt, parts, "\" \"")
for (i = 1; i <= n; i++) {
gsub(/"/, "", parts[i])
@@ -217,9 +218,17 @@ llscan_mdns()
else if (parts[i] ~ /^ov=/) { split(parts[i], kv, "="); ov = kv[2] }
else if (parts[i] ~ /^product=/) { split(parts[i], kv, "="); product = kv[2] }
else if (parts[i] ~ /^deviceid=/) { split(parts[i], kv, "="); devid = kv[2] }
else if (parts[i] ~ /^vv=/) { split(parts[i], kv, "="); vv = kv[2] }
}
if (!show_all && on != "Infix") next
# vv=1 is the platform marker set by confd/services.c, survives OS rebranding.
# We require it together with a management service type to avoid false
# positives from Apple devices, which also use vv=1 in AirPlay/RAOP records.
# on=Infix is kept as a fallback for older firmware that predates vv=1.
mgmt = (stype == "_ssh._tcp" || stype == "_sftp-ssh._tcp" || \
stype == "_https._tcp" || stype == "_http._tcp" || \
stype == "_netconf-ssh._tcp" || stype == "_restconf-tls._tcp")
if (!show_all && !(vv == "1" && mgmt) && on != "Infix") next
# Use deviceid (MAC) as unique key; fall back to hostname
key = devid ? devid : host