add more 'mangle' unique key

This commit is contained in:
Kittizz 2021-08-24 18:24:41 +07:00
parent 40f95e95f2
commit c29b7a9873
2 changed files with 13 additions and 2 deletions

View file

@ -928,6 +928,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",
@ -952,6 +954,12 @@ 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"},
@ -966,6 +974,7 @@ class MikrotikControllerData:
skip=[ skip=[
{"name": "dynamic", "value": True}, {"name": "dynamic", "value": True},
{"name": "action", "value": "jump"}, {"name": "action", "value": "jump"},
{"name": "comment", "value": ""},
], ],
) )

View file

@ -578,7 +578,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"]
@ -596,7 +597,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"]