${isRootNode ? '' : `
`}
-
+
${isRootNode ? getString('Network_Root') : getNameByMacAddress(node.parent_mac)}
${isRootNode ? '' : ``}
@@ -264,16 +265,17 @@
}
},
{
- title: getString('Network_Table_State'),
+ title: getString('Device_TableHead_Status'),
data: 'devStatus',
width: '15%',
render: function (_, type, device) {
const badge = getStatusBadgeParts(
device.devPresentLastScan,
device.devAlertDown,
- device.devMac
+ device.devMac,
+ device.devStatus
);
- return `
${badge.iconHtml} ${badge.status}`;
+ return `
${badge.iconHtml} ${badge.text}`;
}
},
{
@@ -287,6 +289,11 @@
data: 'devLastIP',
width: '5%'
},
+ {
+ title: getString('Device_TableHead_Port'),
+ data: 'devParentPort',
+ width: '5%'
+ },
{
title: getString('Device_TableHead_Vendor'),
data: 'devVendor',
@@ -319,7 +326,7 @@
// ----------------------------------------------------
function loadUnassignedDevices() {
const sql = `
- SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown
+ SELECT devMac, devPresentLastScan, devName, devLastIP, devVendor, devAlertDown, devParentPort
FROM Devices
WHERE (devParentMAC IS NULL OR devParentMAC IN ("", " ", "undefined", "null"))
AND devMac NOT LIKE "%internet%"
@@ -348,14 +355,17 @@
// ----------------------------------------------------
function loadConnectedDevices(node_mac) {
const sql = `
- SELECT devName, devMac, devLastIP, devVendor, devPresentLastScan, devAlertDown,
- CASE
- WHEN devAlertDown != 0 AND devPresentLastScan = 0 THEN "Down"
- WHEN devPresentLastScan = 1 THEN "On-line"
- ELSE "Off-line"
- END as devStatus
+ SELECT devName, devMac, devLastIP, devVendor, devPresentLastScan, devAlertDown, devParentPort,
+ CASE
+ WHEN devIsNew = 1 THEN 'New'
+ WHEN devPresentLastScan = 1 THEN 'On-line'
+ WHEN devPresentLastScan = 0 AND devAlertDown != 0 THEN 'Down'
+ WHEN devIsArchived = 1 THEN 'Archived'
+ WHEN devPresentLastScan = 0 THEN 'Off-line'
+ ELSE 'Unknown status'
+ END AS devStatus
FROM Devices
- WHERE devIsArchived = 0 AND devParentMac = '${node_mac}'`;
+ WHERE devParentMac = '${node_mac}'`;
const id = node_mac.replace(/:/g, '_');
@@ -895,6 +905,66 @@ function updateLeaf(leafMac, action) {
}
}
+// ---------------------------------------------------------------------------
+// showing icons or device names in tabs depending on available screen size
+function checkTabsOverflow() {
+ const $ul = $('.nav-tabs');
+ const $lis = $ul.find('li');
+
+ // First measure widths with current state
+ let totalWidth = 0;
+ $lis.each(function () {
+ totalWidth += $(this).outerWidth(true);
+ });
+
+ const ulWidth = $ul.width();
+ const isOverflowing = totalWidth > ulWidth;
+
+ if (isOverflowing) {
+ if (!$ul.hasClass('hide-node-names')) {
+ $ul.addClass('hide-node-names');
+
+ // Re-check: did hiding fix it?
+ requestAnimationFrame(() => {
+ let newTotal = 0;
+ $lis.each(function () {
+ newTotal += $(this).outerWidth(true);
+ });
+
+ if (newTotal > $ul.width()) {
+ // Still overflowing — do nothing, keep class
+ }
+ });
+ }
+ } else {
+ if ($ul.hasClass('hide-node-names')) {
+ $ul.removeClass('hide-node-names');
+
+ // Re-check: did un-hiding break it?
+ requestAnimationFrame(() => {
+ let newTotal = 0;
+ $lis.each(function () {
+ newTotal += $(this).outerWidth(true);
+ });
+
+ if (newTotal > $ul.width()) {
+ // Oops, that broke it — re-hide
+ $ul.addClass('hide-node-names');
+ }
+ });
+ }
+ }
+}
+
+let resizeTimeout;
+$(window).on('resize', function () {
+ clearTimeout(resizeTimeout);
+ resizeTimeout = setTimeout(() => {
+ checkTabsOverflow();
+ }, 100);
+});
+
+
// init pop up hover boxes for device details
initHoverNodeInfo();
diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json
index b27ee045..50b2f765 100755
--- a/front/php/templates/language/en_us.json
+++ b/front/php/templates/language/en_us.json
@@ -107,7 +107,7 @@
"DevDetail_Network_Node_hover": "Select the parent network device the current device is connected to, to populate the Network tree.",
"DevDetail_Network_Port_hover": "The port this device is connected to on the parent network device. If left empty a wifi icon is displayed in the Network tree.",
"DevDetail_Nmap_Scans": "Manual Nmap Scans",
- "DevDetail_Nmap_Scans_desc": "Here you can execute manual NMAP scans. You can also schedule regular automatic NMAP scans via the Services & Ports (NMAP) plugin. Head to
Settings to find out more",
+ "DevDetail_Nmap_Scans_desc": "Here you can execute manual NMAP scans. You can also schedule regular automatic NMAP scans via the Services & Ports (NMAP) plugin. Head to
Docs to find out more",
"DevDetail_Nmap_buttonDefault": "Default Scan",
"DevDetail_Nmap_buttonDefault_text": "Default Scan: Nmap scans the top 1,000 ports for each scan protocol requested. This catches roughly 93% of the TCP ports and 49% of the UDP ports. (about 5 seconds)",
"DevDetail_Nmap_buttonDetail": "Detailed Scan",
diff --git a/server/scan/session_events.py b/server/scan/session_events.py
index bd0b166a..2ab3c304 100755
--- a/server/scan/session_events.py
+++ b/server/scan/session_events.py
@@ -131,38 +131,51 @@ def void_ghost_disconnections (db):
#-------------------------------------------------------------------------------
def pair_sessions_events (db):
+ # db.commitDB()
+
sql = db.sql #TO-DO
-
+ mylog('debug', '[Pair Session] - START')
- # Pair Connection / New Device events
- mylog('debug','[Pair Session] - 1 Connections / New Devices')
- sql.execute ("""UPDATE Events
- SET eve_PairEventRowid =
- (SELECT ROWID
- FROM Events AS EVE2
- WHERE EVE2.eve_EventType IN ('New Device', 'Connected', 'Down Reconnected',
- 'Device Down', 'Disconnected')
- AND EVE2.eve_MAC = Events.eve_MAC
- AND EVE2.eve_Datetime > Events.eve_DateTime
- ORDER BY EVE2.eve_DateTime ASC LIMIT 1)
- WHERE eve_EventType IN ('New Device', 'Connected', 'Down Reconnected')
- AND eve_PairEventRowid IS NULL
- """ )
+ # Step 1: Pair connection-related events with future unpaired disconnections
+ mylog('debug', '[Pair Session] - 1: Pair Connections → Disconnections')
+ sql.execute("""
+ UPDATE Events
+ SET eve_PairEventRowid = (
+ SELECT E2.ROWID
+ FROM Events AS E2
+ WHERE E2.eve_EventType IN ('Disconnected', 'Device Down')
+ AND E2.eve_MAC = Events.eve_MAC
+ AND E2.eve_PairEventRowid IS NULL
+ AND E2.eve_DateTime > Events.eve_DateTime
+ ORDER BY E2.eve_DateTime ASC
+ LIMIT 1
+ )
+ WHERE eve_EventType IN ('New Device', 'Connected', 'Down Reconnected')
+ AND eve_PairEventRowid IS NULL
+ """)
- # Pair Disconnection / Device Down
- mylog('debug','[Pair Session] - 2 Disconnections')
- sql.execute ("""UPDATE Events
- SET eve_PairEventRowid =
- (SELECT ROWID
- FROM Events AS EVE2
- WHERE EVE2.eve_PairEventRowid = Events.ROWID)
- WHERE eve_EventType IN ('Device Down', 'Disconnected')
- AND eve_PairEventRowid IS NULL
- """ )
- mylog('debug','[Pair Session] Pair session end')
+ # Step 2: Pair disconnection-related events with previous unpaired connections
+ mylog('debug', '[Pair Session] - 2: Pair Disconnections → Connections')
+ sql.execute("""
+ UPDATE Events
+ SET eve_PairEventRowid = (
+ SELECT E2.ROWID
+ FROM Events AS E2
+ WHERE E2.eve_EventType IN ('New Device', 'Connected', 'Down Reconnected')
+ AND E2.eve_MAC = Events.eve_MAC
+ AND E2.eve_PairEventRowid IS NULL
+ AND E2.eve_DateTime < Events.eve_DateTime
+ ORDER BY E2.eve_DateTime DESC
+ LIMIT 1
+ )
+ WHERE eve_EventType IN ('Disconnected', 'Device Down')
+ AND eve_PairEventRowid IS NULL
+ """)
+ mylog('debug', '[Pair Session] - END')
db.commitDB()
+
#-------------------------------------------------------------------------------
def create_sessions_snapshot (db):
sql = db.sql #TO-DO