mirror.MikroTik/tomaae.homeassistant-mikrotik_router
1
0
Fork 0
mirror of https://github.com/tomaae/homeassistant-mikrotik_router.git synced 2025-07-07 07:54:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Accounting initialize fix

Browse source
This commit is contained in:
Ivan Pavlina 2020-04-05 18:32:48 +02:00
parent 887e645553
commit 03e70e521c
1 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

38
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -765,9 +765,9 @@ class MikrotikControllerData:
# Build temp accounting values dict with all known addresses # Build temp accounting values dict with all known addresses
# Also set traffic type for each item # Also set traffic type for each item
accounting_values = {} tmp_accounting_values = {}
for addr in self.data['accounting']: for addr in self.data['accounting']:
accounting_values[addr] = { tmp_accounting_values[addr] = {
"wan-tx": 0, "wan-tx": 0,
"wan-rx": 0, "wan-rx": 0,
"lan-tx": 0, "lan-tx": 0,
@ -796,40 +796,46 @@ class MikrotikControllerData:
if self._address_part_of_local_network(source_ip) and self._address_part_of_local_network(destination_ip): if self._address_part_of_local_network(source_ip) and self._address_part_of_local_network(destination_ip):
# LAN TX/RX # LAN TX/RX
if source_ip in accounting_values: if source_ip in tmp_accounting_values:
accounting_values[source_ip]['lan-tx'] += bits_count tmp_accounting_values[source_ip]['lan-tx'] += bits_count
if destination_ip in accounting_values: if destination_ip in tmp_accounting_values:
accounting_values[destination_ip]['lan-rx'] += bits_count tmp_accounting_values[destination_ip]['lan-rx'] += bits_count
elif self._address_part_of_local_network(source_ip) and \ elif self._address_part_of_local_network(source_ip) and \
not self._address_part_of_local_network(destination_ip): not self._address_part_of_local_network(destination_ip):
# WAN TX # WAN TX
if source_ip in accounting_values: if source_ip in tmp_accounting_values:
accounting_values[source_ip]['wan-tx'] += bits_count tmp_accounting_values[source_ip]['wan-tx'] += bits_count
elif not self._address_part_of_local_network(source_ip) and \ elif not self._address_part_of_local_network(source_ip) and \
self._address_part_of_local_network(destination_ip): self._address_part_of_local_network(destination_ip):
# WAN RX # WAN RX
if destination_ip in accounting_values: if destination_ip in tmp_accounting_values:
accounting_values[destination_ip]['wan-rx'] += bits_count tmp_accounting_values[destination_ip]['wan-rx'] += bits_count
else: else:
_LOGGER.debug(f"Skipping packet from {source_ip} to {destination_ip}") _LOGGER.debug(f"Skipping packet from {source_ip} to {destination_ip}")
continue continue
# Now that we have sum of all traffic in bytes for given period # Now that we have sum of all traffic in bytes for given period
# calculate real throughput and transform it to appropriate unit # calculate real throughput and transform it to appropriate unit
for addr in accounting_values: for addr in tmp_accounting_values:
self.data['accounting'][addr]['wan-tx'] = round( self.data['accounting'][addr]['wan-tx'] = round(
accounting_values[addr]['wan-tx'] / time_diff * traffic_div, 2) tmp_accounting_values[addr]['wan-tx'] / time_diff * traffic_div, 2)
self.data['accounting'][addr]['wan-rx'] = round( self.data['accounting'][addr]['wan-rx'] = round(
accounting_values[addr]['wan-rx'] / time_diff * traffic_div, 2) tmp_accounting_values[addr]['wan-rx'] / time_diff * traffic_div, 2)
if self.api.is_accounting_local_traffic_enabled(): if self.api.is_accounting_local_traffic_enabled():
self.data['accounting'][addr]['lan-tx'] = round( self.data['accounting'][addr]['lan-tx'] = round(
accounting_values[addr]['lan-tx'] / time_diff * traffic_div, 2) tmp_accounting_values[addr]['lan-tx'] / time_diff * traffic_div, 2)
self.data['accounting'][addr]['lan-rx'] = round( self.data['accounting'][addr]['lan-rx'] = round(
accounting_values[addr]['lan-rx'] / time_diff * traffic_div, 2) tmp_accounting_values[addr]['lan-rx'] / time_diff * traffic_div, 2)
else:
# If local traffic was enabled earlier and then disabled return counters for LAN traffic to 0
if 'lan-tx' in self.data['accounting'][addr]:
self.data['accounting'][addr]['lan-tx'] = 0.0
if 'lan-rx' in self.data['accounting'][addr]:
self.data['accounting'][addr]['lan-rx'] = 0.0
else: else:
# No time diff, just initialize/return counters to 0 for all # No time diff, just initialize/return counters to 0 for all
for addr in accounting_values: for addr in tmp_accounting_values:
self.data['accounting'][addr]['wan-tx'] = 0.0 self.data['accounting'][addr]['wan-tx'] = 0.0
self.data['accounting'][addr]['wan-rx'] = 0.0 self.data['accounting'][addr]['wan-rx'] = 0.0