vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

stop devParentMAC overwrite if specified #1021

Browse Source
This commit is contained in:
jokob-sk
2025-03-23 15:24:01 +11:00
parent 4092452363
commit e996c9eccc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server/scan/device_handling.py
View File

@@ -316,7 +316,10 @@ def update_devices_data_from_scan (db):
FROM CurrentScan FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC WHERE Devices.devMac = CurrentScan.cur_MAC
) )
WHERE EXISTS ( WHERE
(devParentPort IS NULL OR devParentPort IN ("", "null", "(unknown)", "(Unknown)"))
AND
EXISTS (
SELECT 1 SELECT 1
FROM CurrentScan FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC WHERE Devices.devMac = CurrentScan.cur_MAC
@@ -331,10 +334,13 @@ def update_devices_data_from_scan (db):
FROM CurrentScan FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC WHERE Devices.devMac = CurrentScan.cur_MAC
) )
WHERE EXISTS ( WHERE
SELECT 1 (devParentMAC IS NULL OR devParentMAC IN ("", "null", "(unknown)", "(Unknown)"))
FROM CurrentScan AND
WHERE Devices.devMac = CurrentScan.cur_MAC EXISTS (
SELECT 1
FROM CurrentScan
WHERE Devices.devMac = CurrentScan.cur_MAC
AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null") AND CurrentScan.cur_NetworkNodeMAC IS NOT NULL AND CurrentScan.cur_NetworkNodeMAC NOT IN ("", "null")
)""") )""")