jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-29 16:17:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove lock and add host timeout to NMAP scanner

Browse Source
This commit is contained in:
Paulus Schoutsen 2015-03-25 22:50:51 -07:00
parent c3fc19353b
commit 4484baa866
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
homeassistant/components/device_tracker/nmap_tracker.py
View File

@ -1,7 +1,6 @@
""" Supports scanning using nmap. """ """ Supports scanning using nmap. """
import logging import logging
from datetime import timedelta, datetime from datetime import timedelta, datetime
import threading
from collections import namedtuple from collections import namedtuple
import subprocess import subprocess
import re import re
@ -54,7 +53,6 @@ class NmapDeviceScanner(object):
def __init__(self, config): def __init__(self, config):
self.last_results = [] self.last_results = []
self.lock = threading.Lock()
self.hosts = config[CONF_HOSTS] self.hosts = config[CONF_HOSTS]
minutes = convert(config.get(CONF_HOME_INTERVAL), int, 0) minutes = convert(config.get(CONF_HOME_INTERVAL), int, 0)
self.home_interval = timedelta(minutes=minutes) self.home_interval = timedelta(minutes=minutes)
@ -116,28 +114,27 @@ class NmapDeviceScanner(object):
if not self.success_init: if not self.success_init:
return False return False
with self.lock: _LOGGER.info("Scanning")
_LOGGER.info("Scanning")
options = "-F" options = "-F --host-timeout 5"
exclude_targets = set() exclude_targets = set()
if self.home_interval: if self.home_interval:
now = datetime.now() now = datetime.now()
for host in self.last_results: for host in self.last_results:
if host.last_update + self.home_interval > now: if host.last_update + self.home_interval > now:
exclude_targets.add(host) exclude_targets.add(host)
if len(exclude_targets) > 0: if len(exclude_targets) > 0:
target_list = [t.ip for t in exclude_targets] target_list = [t.ip for t in exclude_targets]
options += " --exclude {}".format(",".join(target_list)) options += " --exclude {}".format(",".join(target_list))
nmap = NmapProcess(targets=self.hosts, options=options) nmap = NmapProcess(targets=self.hosts, options=options)
nmap.run() nmap.run()
if nmap.rc == 0: if nmap.rc == 0:
if self._parse_results(nmap.stdout): if self._parse_results(nmap.stdout):
self.last_results.extend(exclude_targets) self.last_results.extend(exclude_targets)
else: else:
self.last_results = [] self.last_results = []
_LOGGER.error(nmap.stderr) _LOGGER.error(nmap.stderr)
return False return False