"
+ },
+ {
+ "equals": "watched-changed",
+ "replacement": "
"
+ },
+ {
+ "equals": "new",
+ "replacement": "
"
+ },
+ {
+ "equals": "missing-in-last-scan",
+ "replacement": "
"
+ }
+ ],
+ "localized": ["name"],
+ "name": [
+ {
+ "language_code": "en_us",
+ "string": "Status"
+ }
+ ]
+ }
+ ]
+}
diff --git a/install/install_dependencies.debian.sh b/install/install_dependencies.debian.sh
index 664e9ee5..28cd57ff 100755
--- a/install/install_dependencies.debian.sh
+++ b/install/install_dependencies.debian.sh
@@ -16,7 +16,7 @@ fi
apt-get install -y \
tini snmp ca-certificates curl libwww-perl arp-scan perl apt-utils cron sudo \
nginx-light php php-cgi php-fpm php-sqlite3 php-curl php-openssl sqlite3 dnsutils net-tools \
- python3 python3-dev iproute2 nmap python3-pip zip systemctl usbutils traceroute nbtscan build-essential
+ python3 python3-dev iproute2 nmap python3-pip zip systemctl usbutils traceroute nbtscan avahi avahi-tools openrc dbus build-essential
# alternate dependencies
sudo apt-get install nginx nginx-core mtr php-fpm php8.2-fpm php-cli php8.2 php8.2-sqlite3 -y
diff --git a/server/device.py b/server/device.py
index b46fbc68..f27e77da 100755
--- a/server/device.py
+++ b/server/device.py
@@ -4,7 +4,7 @@ import subprocess
import conf
import os
import re
-from helper import timeNowTZ, get_setting, get_setting_value, list_to_where, resolve_device_name_dig, resolve_device_name_pholus, get_device_name_nbtlookup, get_device_name_nslookup, check_IP_format, sanitize_SQL_input
+from helper import timeNowTZ, get_setting, get_setting_value, list_to_where, resolve_device_name_dig, resolve_device_name_pholus, get_device_name_nbtlookup, get_device_name_nslookup, get_device_name_mdns, check_IP_format, sanitize_SQL_input
from logger import mylog, print_log
from const import vendorsPath, vendorsPathNewest, sql_generateGuid
@@ -465,6 +465,7 @@ def update_devices_names (db):
notFound = 0
foundDig = 0
+ foundmDNSLookup = 0
foundNsLookup = 0
foundNbtLookup = 0
foundPholus = 0
@@ -499,6 +500,13 @@ def update_devices_names (db):
# count
if newName != nameNotFound:
foundDig += 1
+
+ # Resolve device name with AVAHISCAN plugin data
+ if newName == nameNotFound:
+ newName = get_device_name_mdns(db, device['dev_MAC'], device['dev_LastIP'])
+
+ if newName != nameNotFound:
+ foundmDNSLookup += 1
# Resolve device name with NSLOOKUP plugin data
if newName == nameNotFound:
@@ -542,8 +550,8 @@ def update_devices_names (db):
recordsToUpdate.append ([newName, device['dev_MAC']])
# Print log
- mylog('verbose', ['[Update Device Name] Names Found (DiG/NSLOOKUP/NBTSCAN/Pholus): ', len(recordsToUpdate), " (",foundDig,"/",foundNsLookup,"/",foundNbtLookup,"/", foundPholus ,")"] )
- mylog('verbose', ['[Update Device Name] Names Not Found : ', notFound] )
+ mylog('verbose', [f'[Update Device Name] Names Found (DiG/mDNS/NSLOOKUP/NBTSCAN/Pholus): {len(recordsToUpdate)} ( {foundmDNSLookup}/{foundDig}/{foundNsLookup}/{foundNbtLookup}/{foundPholus})'] )
+ mylog('verbose', [f'[Update Device Name] Names Not Found : {notFound}'] )
# update not found devices with (name not found)
sql.executemany ("UPDATE Devices SET dev_Name = ? WHERE dev_MAC = ? ", recordsNotFound )
diff --git a/server/helper.py b/server/helper.py
index cb6f3163..4c6010b0 100755
--- a/server/helper.py
+++ b/server/helper.py
@@ -510,7 +510,50 @@ def check_IP_format (pIP):
# Return IP
return IP.group(0)
+#-------------------------------------------------------------------------------
+def get_device_name_mdns(db, pMAC, pIP):
+
+ nameNotFound = "(name not found)"
+ sql = db.sql
+
+ name = nameNotFound
+
+ # get names from the AVAHISCAN plugin entries vased on MAC
+ sql.execute(
+ f"""
+ SELECT Watched_Value2 FROM Plugins_Objects
+ WHERE
+ Plugin = 'AVAHISCAN' AND
+ Object_PrimaryID = '{pMAC}'
+ """
+ )
+ nameEntry = sql.fetchall()
+ db.commitDB()
+
+ if len(nameEntry) != 0:
+ name = cleanDeviceName(nameEntry[0][0], False)
+
+ return name
+
+ # get names from the AVAHISCAN plugin entries based on IP
+ sql.execute(
+ f"""
+ SELECT Watched_Value2 FROM Plugins_Objects
+ WHERE
+ Plugin = 'AVAHISCAN' AND
+ Object_SecondaryID = '{pIP}'
+ """
+ )
+ nameEntry = sql.fetchall()
+ db.commitDB()
+
+ if len(nameEntry) != 0:
+ name = cleanDeviceName(nameEntry[0][0], True)
+
+ return name
+
+ return name
#-------------------------------------------------------------------------------
def get_device_name_nslookup(db, pMAC, pIP):