cfg.add_argument(
'--arper_cache_max_staleness',
type=argparse_utils.valid_duration,
- default=datetime.timedelta(seconds=60 * 60),
+ default=datetime.timedelta(seconds=60 * 15),
metavar='DURATION',
help='Max acceptable age of the kernel arp table cache'
)
@persistent.persistent_autoloaded_singleton()
class Arper(persistent.Persistent):
def __init__(
- self, cached_state: Optional[BiDict[str, str]] = None
+ self, cached_state: Optional[BiDict] = None
) -> None:
self.state = BiDict()
if cached_state is not None:
self.state = cached_state
else:
logger.debug('No usable cached state; calling /usr/sbin/arp')
- self.update()
+ self.update_from_arp_scan()
+ self.update_from_arp()
+ if len(self.state) < config.config['arper_min_entries_to_be_valid']:
+ raise Exception('Arper didn\'t find enough entries; only got {len(self.state)}.')
- def update(self):
- output = exec_utils.cmd(
- '/usr/sbin/arp -a',
- timeout_seconds=5.0
- )
+ def update_from_arp_scan(self):
+ network_spec = site_config.get_config().network
+ try:
+ output = exec_utils.cmd(
+ f'/usr/local/bin/arp-scan --retry=6 --timeout 350 --backoff=1.4 --random --numeric --plain --ignoredups {network_spec}',
+ timeout_seconds=10.0
+ )
+ except Exception as e:
+ logger.exception(e)
+ return
for line in output.split('\n'):
ip = string_utils.extract_ip_v4(line)
mac = string_utils.extract_mac_address(line)
- if ip is not None and mac is not None:
+ if ip is not None and mac is not None and mac != 'UNKNOWN' and ip != 'UNKNOWN':
mac = mac.lower()
- logger.debug(f' {mac} => {ip}')
+ logger.debug(f'ARPER: {mac} => {ip}')
+ self.state[mac] = ip
+
+ def update_from_arp(self):
+ try:
+ output = exec_utils.cmd(
+ '/usr/sbin/arp -a',
+ timeout_seconds=10.0
+ )
+ except Exception as e:
+ logger.exception(e)
+ return
+ for line in output.split('\n'):
+ ip = string_utils.extract_ip_v4(line)
+ mac = string_utils.extract_mac_address(line)
+ if ip is not None and mac is not None and mac != 'UNKNOWN' and ip != 'UNKNOWN':
+ mac = mac.lower()
+ logger.debug(f'ARPER: {mac} => {ip}')
self.state[mac] = ip
def get_ip_by_mac(self, mac: str) -> Optional[str]:
f'{cache_file} sucks, only {len(cached_state)} entries. Deleting it.'
)
os.remove(cache_file)
-
logger.debug('No usable saved state found')
return None