aboutsummaryrefslogtreecommitdiffstats
path: root/mod/bridge-port-vlan
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2022-05-12 11:04:43 +0200
committerGravatar Christian Hesse <mail@eworm.de>2022-05-12 11:04:43 +0200
commitdf547b87a47e279d3f6b744675821621eea5d7b8 (patch)
treed5b33fb62e10637d70d8d0616437294ceb15ed9f /mod/bridge-port-vlan
parent93ec9afe558ef6eba5d513fab359bb5f6618666d (diff)
parent12655bd58afc3a75fe3e2958bbe130b96f8b9be7 (diff)
Merge branch 'ros-v7-path-syntax' into next
Diffstat (limited to 'mod/bridge-port-vlan')
-rw-r--r--mod/bridge-port-vlan18
1 files changed, 9 insertions, 9 deletions
diff --git a/mod/bridge-port-vlan b/mod/bridge-port-vlan
index db9cbfd..6255dff 100644
--- a/mod/bridge-port-vlan
+++ b/mod/bridge-port-vlan
@@ -16,29 +16,29 @@
:global LogPrintExit2;
:global ParseKeyValueStore;
- :foreach BridgePort in=[ / interface bridge port find where !(comment=[]) ] do={
- :local BridgePortVal [ / interface bridge port get $BridgePort ];
+ :foreach BridgePort in=[ /interface/bridge/port/find where !(comment=[]) ] do={
+ :local BridgePortVal [ /interface/bridge/port/get $BridgePort ];
:foreach Config,Vlan in=[ $ParseKeyValueStore ($BridgePortVal->"comment") ] do={
:if ($Config = $ConfigTo) do={
- :local DHCPClient [ / ip dhcp-client find where interface=$BridgePortVal->"interface" comment="toggle with bridge port" ];
+ :local DHCPClient [ /ip/dhcp-client/find where interface=$BridgePortVal->"interface" comment="toggle with bridge port" ];
:if ($Vlan = "dhcp-client") do={
:if ([ :len $DHCPClient ] != 1) do={
$LogPrintExit2 warning $0 ([ $IfThenElse ([ :len $DHCPClient ] = 0) "Missing" "Duplicate" ] . \
" dhcp client configuration for interface " . $BridgePortVal->"interface" . "!") true;
}
- :local DHCPClientDisabled [ / ip dhcp-client get $DHCPClient disabled ];
+ :local DHCPClientDisabled [ /ip/dhcp-client/get $DHCPClient disabled ];
:if ($BridgePortVal->"disabled" = false || $DHCPClientDisabled = true) do={
$LogPrintExit2 info $0 ("Disabling bridge port for interface " . $BridgePortVal->"interface" . ", enabling dhcp client.") false;
- / interface bridge port disable $BridgePort;
+ /interface/bridge/port/disable $BridgePort;
:delay 200ms;
- / ip dhcp-client enable $DHCPClient;
+ /ip/dhcp-client/enable $DHCPClient;
}
} else={
:if ($Vlan != [ :tostr [ :tonum $Vlan ] ]) do={
:do {
- :set $Vlan ([ / interface bridge vlan get [ find where comment=$Vlan ] vlan-ids ]->0);
+ :set $Vlan ([ /interface/bridge/vlan/get [ find where comment=$Vlan ] vlan-ids ]->0);
} on-error={
$LogPrintExit2 warning $0 ("Could not find VLAN '" . $Vlan . "' for interface " . $BridgePortVal->"interface" . "!") true;
}
@@ -47,10 +47,10 @@
$LogPrintExit2 info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $ConfigTo . \
" vlan " . $Vlan . ", disabling dhcp client.") false;
:if ([ :len $DHCPClient ] = 1) do={
- / ip dhcp-client disable $DHCPClient;
+ /ip/dhcp-client/disable $DHCPClient;
:delay 200ms;
}
- / interface bridge port set disabled=no pvid=$Vlan $BridgePort;
+ /interface/bridge/port/set disabled=no pvid=$Vlan $BridgePort;
} else={
$LogPrintExit2 debug $0 ("Interface " . $BridgePortVal->"interface" . " already connected to " . $ConfigTo . \
" vlan " . $Vlan . ".") false;