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

Changed unique mangle name #75

Browse source
This commit is contained in:
tomaae 2020-12-25 09:22:54 +01:00
parent 68a47ffa3c
commit 4d83bbfbee
2 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

14
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -772,7 +772,9 @@ class MikrotikControllerData:
{"name": "new-packet-mark"}, {"name": "new-packet-mark"},
{"name": "src-address-list"}, {"name": "src-address-list"},
{"name": "protocol", "default": "any"}, {"name": "protocol", "default": "any"},
{"name": "src-address", "default": "any"},
{"name": "src-port", "default": "any"}, {"name": "src-port", "default": "any"},
{"name": "dst-address", "default": "any"},
{"name": "dst-port", "default": "any"}, {"name": "dst-port", "default": "any"},
{ {
"name": "enabled", "name": "enabled",
@ -785,7 +787,17 @@ class MikrotikControllerData:
[ [
{"name": "name"}, {"name": "name"},
{"action": "combine"}, {"action": "combine"},
{"key": "chain"},
{"text": ","},
{"key": "action"},
{"text": ","},
{"key": "protocol"}, {"key": "protocol"},
{"text": ","},
{"key": "src-address"},
{"text": ":"},
{"key": "src-port"},
{"text": "-"},
{"key": "dst-address"},
{"text": ":"}, {"text": ":"},
{"key": "dst-port"}, {"key": "dst-port"},
] ]
@ -794,7 +806,7 @@ class MikrotikControllerData:
{"name": "dynamic", "value": True}, {"name": "dynamic", "value": True},
{"name": "action", "value": "jump"}, {"name": "action", "value": "jump"},
{"name": "protocol", "value": ""}, {"name": "protocol", "value": ""},
{"name": "dst-port", "value": ""}, # {"name": "dst-port", "value": ""},
], ],
) )

4
custom_components/mikrotik_router/switch.py
View file

@ -445,7 +445,7 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
for uid in self._ctrl.data["mangle"]: for uid in self._ctrl.data["mangle"]:
if ( if (
self._ctrl.data["mangle"][uid]["name"] self._ctrl.data["mangle"][uid]["name"]
== f"{self._data['protocol']}:{self._data['dst-port']}" == f"{self._data['chain']},{self._data['action']},{self._data['protocol']},{self._data['src-address']}:{self._data['src-port']}:{self._data['dst-address']}:{self._data['dst-port']}"
): ):
value = self._ctrl.data["mangle"][uid][".id"] value = self._ctrl.data["mangle"][uid][".id"]
@ -462,7 +462,7 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
for uid in self._ctrl.data["mangle"]: for uid in self._ctrl.data["mangle"]:
if ( if (
self._ctrl.data["mangle"][uid]["name"] self._ctrl.data["mangle"][uid]["name"]
== f"{self._data['protocol']}:{self._data['dst-port']}" == f"{self._data['chain']},{self._data['action']},{self._data['protocol']},{self._data['src-address']}:{self._data['src-port']}:{self._data['dst-address']}:{self._data['dst-port']}"
): ):
value = self._ctrl.data["mangle"][uid][".id"] value = self._ctrl.data["mangle"][uid][".id"]