From a8cc4de4d08e561d67b9fdffba00943c70951c2e Mon Sep 17 00:00:00 2001
From: jokob-sk <jokob-sk@gmail.com>
Date: Sat, 19 Oct 2024 08:35:42 +1100
Subject: [PATCH] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Make=20Rogue=20DHCP=20time?=
 =?UTF-8?q?out=20configurable=20=20#851?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 front/php/templates/language/de_de.json | 0
 front/php/templates/language/ru_ru.json | 0
 front/plugins/dhcp_servers/config.json  | 2 +-
 front/plugins/dhcp_servers/script.py    | 8 ++++++--
 4 files changed, 7 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 front/php/templates/language/de_de.json
 mode change 100644 => 100755 front/php/templates/language/ru_ru.json

diff --git a/front/php/templates/language/de_de.json b/front/php/templates/language/de_de.json
old mode 100644
new mode 100755
diff --git a/front/php/templates/language/ru_ru.json b/front/php/templates/language/ru_ru.json
old mode 100644
new mode 100755
diff --git a/front/plugins/dhcp_servers/config.json b/front/plugins/dhcp_servers/config.json
index 0dca4796..d168de9d 100755
--- a/front/plugins/dhcp_servers/config.json
+++ b/front/plugins/dhcp_servers/config.json
@@ -424,7 +424,7 @@
           }
         ]
       },
-      "default_value": 10,
+      "default_value": 20,
       "options": [],
       "localized": ["name", "description"],
       "name": [
diff --git a/front/plugins/dhcp_servers/script.py b/front/plugins/dhcp_servers/script.py
index 28afd207..a7b1a068 100755
--- a/front/plugins/dhcp_servers/script.py
+++ b/front/plugins/dhcp_servers/script.py
@@ -27,7 +27,7 @@ def main():
     last_run_logfile.write("")
     
     plugin_objects = Plugin_Objects(RESULT_FILE)
-    timeoutSec = 10
+    timeoutSec = get_setting_value('DHCPSRVS_RUN_TIMEOUT')
 
     nmapArgs = ['sudo', 'nmap', '--script', 'broadcast-dhcp-discover']
 
@@ -42,6 +42,9 @@ def main():
         newEntries = []
 
         for line in newLines:
+            
+            mylog('verbose', [f'[DHCPSRVS] Processing line: {line} '])
+            
             if 'Response ' in line and ' of ' in line:
                 newEntries.append(Plugin_Object())
             elif 'Server Identifier' in line:
@@ -67,6 +70,7 @@ def main():
                     newEntries[-1].extra += ',' + newVal
 
         for e in newEntries:
+            
             plugin_objects.add_object(
                 primaryId=e.primaryId,
                 secondaryId=e.secondaryId,
@@ -80,7 +84,7 @@ def main():
 
         plugin_objects.write_result_file()
     except Exception as e:
-        mylog('none', ['Error in main:', str(e)])
+        mylog('verbose', ['[DHCPSRVS] Error in main:', str(e)])
 
 if __name__ == '__main__':
     main()