mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-06-27 11:18:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

get_arp refactoring

Browse source
This commit is contained in:
tomaae 2019-12-05 22:29:25 +01:00
parent 91b769481e
commit 732060e4fe
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -158,7 +158,7 @@ class MikrotikControllerData():
await self.async_fwupdate_check() await self.async_fwupdate_check()
self.get_interface() self.get_interface()
self.get_arp() self.get_interface_client()
self.get_nat() self.get_nat()
self.get_system_resource() self.get_system_resource()
self.get_script() self.get_script()
@ -227,11 +227,13 @@ class MikrotikControllerData():
return return
# --------------------------- # ---------------------------
# get_arp # get_interface_client
# --------------------------- # ---------------------------
def get_arp(self): def get_interface_client(self):
"""Get ARP data from Mikrotik""" """Get ARP data from Mikrotik"""
self.data['arp'] = {} self.data['arp'] = {}
# Remove data if disabled
if not self.option_track_arp: if not self.option_track_arp:
for uid in self.data['interface']: for uid in self.data['interface']:
self.data['interface'][uid]['client-ip-address'] = "disabled" self.data['interface'][uid]['client-ip-address'] = "disabled"
@ -240,6 +242,23 @@ class MikrotikControllerData():
mac2ip = {} mac2ip = {}
bridge_used = False bridge_used = False
mac2ip, bridge_used = self.update_arp(mac2ip, bridge_used)
if bridge_used:
self.update_bridge_hosts(mac2ip)
# Map ARP to ifaces
for uid in self.data['interface']:
self.data['interface'][uid]['client-ip-address'] = self.data['arp'][uid]['address'] if uid in self.data['arp'] and 'address' in self.data['arp'][uid] else ""
self.data['interface'][uid]['client-mac-address'] = self.data['arp'][uid]['mac-address'] if uid in self.data['arp'] and 'mac-address' in self.data['arp'][uid] else ""
return True
# ---------------------------
# update_arp
# ---------------------------
def update_arp(self, mac2ip, bridge_used):
"""Get list of hosts in ARP for interface client data from Mikrotik"""
data = self.api.path("/ip/arp") data = self.api.path("/ip/arp")
for entry in data: for entry in data:
# Ignore invalid entries # Ignore invalid entries
@ -268,22 +287,13 @@ class MikrotikControllerData():
self.data['arp'][uid]['interface'] = uid self.data['arp'][uid]['interface'] = uid
self.data['arp'][uid]['mac-address'] = "multiple" if 'mac-address' in self.data['arp'][uid] else entry['mac-address'] self.data['arp'][uid]['mac-address'] = "multiple" if 'mac-address' in self.data['arp'][uid] else entry['mac-address']
self.data['arp'][uid]['address'] = "multiple" if 'address' in self.data['arp'][uid] else entry['address'] self.data['arp'][uid]['address'] = "multiple" if 'address' in self.data['arp'][uid] else entry['address']
return mac2ip, bridge_used
if bridge_used:
self.update_bridge_hosts(mac2ip)
# Map ARP to ifaces
for uid in self.data['interface']:
self.data['interface'][uid]['client-ip-address'] = self.data['arp'][uid]['address'] if uid in self.data['arp'] and 'address' in self.data['arp'][uid] else ""
self.data['interface'][uid]['client-mac-address'] = self.data['arp'][uid]['mac-address'] if uid in self.data['arp'] and 'mac-address' in self.data['arp'][uid] else ""
return True
# --------------------------- # ---------------------------
# update_bridge_hosts # update_bridge_hosts
# --------------------------- # ---------------------------
def update_bridge_hosts(self, mac2ip): def update_bridge_hosts(self, mac2ip):
"""Get list of hosts in bridge for ARP data from Mikrotik""" """Get list of hosts in bridge for interface client data from Mikrotik"""
data = self.api.path("/interface/bridge/host") data = self.api.path("/interface/bridge/host")
for entry in data: for entry in data:
# Ignore port MAC # Ignore port MAC