cphipps/NetAlertX
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Addd subprocess timeout into Pholus 0.2

Browse Source
This commit is contained in:
Jokob-sk
2023-01-27 00:07:34 +11:00
parent 43c2084e15
commit 2c27248aa1
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
front/devices.php
View File

@@ -345,14 +345,9 @@ function initializeDatatable () {
} }, } },
// Connected Devices // Connected Devices
// <a onclick="setCache(\'activeNetworkTab\',\''.$idParentMac.'_id\')" href="./network.php">
// <b class="anonymize">'.$idParentMac.' <i class="fa fa-square-up-right"></i></b>
// </a>
{targets: [mapIndx(15)], {targets: [mapIndx(15)],
'createdCell': function (td, cellData, rowData, row, col) { 'createdCell': function (td, cellData, rowData, row, col) {
$(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>'); $(td).html ('<b><a href="./network.php?mac='+ rowData[mapIndx(11)] +'" class="">'+ cellData +'</a></b>');
// $(td).find("b").attr('onclick', "setCache('activeNetworkTab','"+rowData[mapIndx(11)]+"_id')" );
} }, } },
// Icon // Icon

16
pholus/pholus3.py
View File

@@ -864,7 +864,9 @@ def main():
file_print_pr("[DEBUG] Timestamp 34: ", timeNow()) file_print_pr("[DEBUG] Timestamp 34: ", timeNow())
pr = multiprocessing.Process(target=Sniffer_Offline, args=(values.interface,q,values.show_ttl,values.d4, values.d6, values.target_mac, values.auto_fake_responses,values.source6,values.source4,values.target_mac,values.target_mac,values.source_mac,values.hlimit)) pr = multiprocessing.Process(target=Sniffer_Offline, args=(values.interface,q,values.show_ttl,values.d4, values.d6, values.target_mac, values.auto_fake_responses,values.source6,values.source4,values.target_mac,values.target_mac,values.source_mac,values.hlimit))
pr.start() pr.start()
pr.join() pr.join(15)
if pr.is_alive():
file_print("SUB-PROCESS KILLED TIMESTAMP: ", timeNow())
file_print_pr("[DEBUG] Timestamp 35: ", timeNow()) file_print_pr("[DEBUG] Timestamp 35: ", timeNow())
results=[] results=[]
while not q.empty(): while not q.empty():
@@ -1118,7 +1120,9 @@ def main():
file_print_pr("[DEBUG] Timestamp 56: ", timeNow()) file_print_pr("[DEBUG] Timestamp 56: ", timeNow())
try: try:
file_print_pr("[DEBUG] Timestamp 57: ", timeNow()) file_print_pr("[DEBUG] Timestamp 57: ", timeNow())
pr2.join() pr2.join(15)
if pr.is_alive():
file_print("SUB-PROCESS KILLED TIMESTAMP: ", timeNow())
file_print_pr("[DEBUG] Timestamp 58: ", timeNow()) file_print_pr("[DEBUG] Timestamp 58: ", timeNow())
except KeyboardInterrupt: except KeyboardInterrupt:
file_print("Exiting on user's request 3") file_print("Exiting on user's request 3")
@@ -1143,7 +1147,9 @@ def main():
if pr2: if pr2:
try: try:
file_print_pr("[DEBUG] Timestamp 61: ", timeNow()) file_print_pr("[DEBUG] Timestamp 61: ", timeNow())
pr2.join() pr2.join(15)
if pr.is_alive():
file_print("SUB-PROCESS KILLED TIMESTAMP: ", timeNow())
file_print_pr("[DEBUG] Timestamp 62: ", timeNow()) file_print_pr("[DEBUG] Timestamp 62: ", timeNow())
except KeyboardInterrupt: except KeyboardInterrupt:
file_print("Exiting on user's request 4") file_print("Exiting on user's request 4")
@@ -1170,7 +1176,9 @@ def main():
if pr3: if pr3:
try: try:
file_print_pr("[DEBUG] Timestamp 65: ", timeNow()) file_print_pr("[DEBUG] Timestamp 65: ", timeNow())
pr3.join() pr3.join(15)
if pr.is_alive():
file_print("SUB-PROCESS KILLED TIMESTAMP: ", timeNow())
file_print_pr("[DEBUG] Timestamp 66: ", timeNow()) file_print_pr("[DEBUG] Timestamp 66: ", timeNow())
except KeyboardInterrupt: except KeyboardInterrupt:
file_print("Exiting on user's request 5") file_print("Exiting on user's request 5")