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

Merge pull request #134 from kittizz/master

Browse source 
add more unique key mangle role
This commit is contained in:
Tomaae 2022-01-09 01:16:10 +01:00 • committed by GitHub
commit 0120409382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
custom_components/mikrotik_router/mikrotik_controller.py
View file

@ -952,6 +952,8 @@ class MikrotikControllerData:
{"name": "src-port", "default": "any"}, {"name": "src-port", "default": "any"},
{"name": "dst-address", "default": "any"}, {"name": "dst-address", "default": "any"},
{"name": "dst-port", "default": "any"}, {"name": "dst-port", "default": "any"},
{"name": "src-address-list", "default": "any"},
{"name": "dst-address-list", "default": "any"},
{ {
"name": "enabled", "name": "enabled",
"source": "disabled", "source": "disabled",
@ -976,6 +978,10 @@ class MikrotikControllerData:
{"key": "dst-address"}, {"key": "dst-address"},
{"text": ":"}, {"text": ":"},
{"key": "dst-port"}, {"key": "dst-port"},
{"text": ","},
{"key": "src-address-list"},
{"text": "-"},
{"key": "dst-address-list"},
], ],
[ [
{"name": "name"}, {"name": "name"},

6
custom_components/mikrotik_router/switch.py
View file

@ -619,7 +619,8 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
if self._ctrl.data["mangle"][uid]["uniq-id"] == ( if self._ctrl.data["mangle"][uid]["uniq-id"] == (
f"{self._data['chain']},{self._data['action']},{self._data['protocol']}," f"{self._data['chain']},{self._data['action']},{self._data['protocol']},"
f"{self._data['src-address']}:{self._data['src-port']}-" f"{self._data['src-address']}:{self._data['src-port']}-"
f"{self._data['dst-address']}:{self._data['dst-port']}" f"{self._data['dst-address']}:{self._data['dst-port']},"
f"{self._data['src-address-list']}-{self._data['dst-address-list']}"
): ):
value = self._ctrl.data["mangle"][uid][".id"] value = self._ctrl.data["mangle"][uid][".id"]
@ -637,7 +638,8 @@ class MikrotikControllerMangleSwitch(MikrotikControllerSwitch):
if self._ctrl.data["mangle"][uid]["uniq-id"] == ( if self._ctrl.data["mangle"][uid]["uniq-id"] == (
f"{self._data['chain']},{self._data['action']},{self._data['protocol']}," f"{self._data['chain']},{self._data['action']},{self._data['protocol']},"
f"{self._data['src-address']}:{self._data['src-port']}-" f"{self._data['src-address']}:{self._data['src-port']}-"
f"{self._data['dst-address']}:{self._data['dst-port']}" f"{self._data['dst-address']}:{self._data['dst-port']},"
f"{self._data['src-address-list']}-{self._data['dst-address-list']}"
): ):
value = self._ctrl.data["mangle"][uid][".id"] value = self._ctrl.data["mangle"][uid][".id"]