🔌 SNMP work #718
Some checks are pending
docker / docker_dev (push) Waiting to run

This commit is contained in:
jokob-sk
2024-07-04 16:55:57 +10:00
parent 6e6b99fa46
commit 482902f6e4
2 changed files with 11 additions and 9 deletions

View File

@@ -25,7 +25,7 @@ def main():
mylog('verbose', ['[SNMPDSC] In script ']) mylog('verbose', ['[SNMPDSC] In script '])
# init global variables # 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.') 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) plugin_objects = Plugin_Objects(RESULT_FILE)
if values.routers: if values.routers:
ROUTERS = values.routers.split('=')[1].replace('\'','') snmpWalkCmds = values.routers.split('=')[1].replace('\'','')
if ',' in ROUTERS: if ',' in snmpWalkCmds:
routers = ROUTERS.split(',') commands = snmpWalkCmds.split(',')
else: else:
routers = [ROUTERS] commands = [snmpWalkCmds]
for router in routers: for cmd in commands:
mylog('verbose', ['[SNMPDSC] Router snmpwalk command: ', router]) mylog('verbose', ['[SNMPDSC] Router snmpwalk command: ', cmd])
timeoutSec = 10 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 # Execute N probes and insert in list
probes = 1 # N probes probes = 1 # N probes

View File

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