🔌 SNMP work #718

front/plugins/snmp_discovery/script.py

@@ -25,7 +25,7 @@ def main():
     mylog('verbose', ['[SNMPDSC] In script ']) 
 
     # init global variables
-    global ROUTERS
+    global snmpWalkCmds
 
     
     parser = argparse.ArgumentParser(description='This plugin is used to discover devices via the arp table(s) of a RFC1213 compliant router or switch.')    
@@ -35,18 +35,20 @@ def main():
     plugin_objects = Plugin_Objects(RESULT_FILE)
 
     if values.routers:        
-        ROUTERS = values.routers.split('=')[1].replace('\'','')  
+        snmpWalkCmds = values.routers.split('=')[1].replace('\'','')  
         
 
-        if ',' in ROUTERS:
-            routers = ROUTERS.split(',')
+        if ',' in snmpWalkCmds:
+            commands = snmpWalkCmds.split(',')
         else:
-            routers = [ROUTERS]
+            commands = [snmpWalkCmds]
     
-        for router in routers:
-            mylog('verbose', ['[SNMPDSC] Router snmpwalk command: ', router]) 
+        for cmd in commands:
+            mylog('verbose', ['[SNMPDSC] Router snmpwalk command: ', cmd]) 
             timeoutSec = 10
-            snmpwalkArgs = router.split(' ')
+            # split the string, remove white spaces around each item, and exclude any empty strings
+            snmpwalkArgs = [arg.strip() for arg in cmd.split(' ') if arg.strip()]
+
 
             # Execute N probes and insert in list
             probes = 1  # N probes

server/device.py

@@ -270,7 +270,7 @@ def update_devices_data_from_scan (db):
                                       WHERE dev_MAC = cur_MAC) """)
 
     # Update IP 
-    mylog('debug', '[Update Devices] - cur_IP -> dev_LastIP ')
+    mylog('debug', '[Update Devices] - cur_IP -> dev_LastIP (always updated)')
     sql.execute("""UPDATE Devices
                     SET dev_LastIP = (SELECT cur_IP FROM CurrentScan
                                       WHERE dev_MAC = cur_MAC)