mirror.MikroTik/eworm.routeros-scripts
1
0
Fork 0
mirror of https://git.eworm.de/cgit/routeros-scripts synced 2025-06-25 02:58:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod/bridge-port-vlan: switch to $LogPrint

Browse source
This commit is contained in:
Christian Hesse 2024-03-08 12:45:38 +01:00
parent b7983d18c4
commit bdcf43a6f6
1 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

22
mod/bridge-port-vlan.rsc
View file

@ -12,7 +12,7 @@
:local ConfigTo [ :tostr $1 ]; :local ConfigTo [ :tostr $1 ];
:global IfThenElse; :global IfThenElse;
:global LogPrintExit2; :global LogPrint;
:global ParseKeyValueStore; :global ParseKeyValueStore;
:local InterfaceReEnable ({}); :local InterfaceReEnable ({});
@ -24,13 +24,14 @@
:if ($Vlan = "dhcp-client") do={ :if ($Vlan = "dhcp-client") do={
:if ([ :len $DHCPClient ] != 1) do={ :if ([ :len $DHCPClient ] != 1) do={
$LogPrintExit2 warning $0 ([ $IfThenElse ([ :len $DHCPClient ] = 0) "Missing" "Duplicate" ] . \ $LogPrint warning $0 ([ $IfThenElse ([ :len $DHCPClient ] = 0) "Missing" "Duplicate" ] . \
" dhcp client configuration for interface " . $BridgePortVal->"interface" . "!") true; " dhcp client configuration for interface " . $BridgePortVal->"interface" . "!");
:error false;
} }
:local DHCPClientDisabled [ /ip/dhcp-client/get $DHCPClient disabled ]; :local DHCPClientDisabled [ /ip/dhcp-client/get $DHCPClient disabled ];
:if ($BridgePortVal->"disabled" = false || $DHCPClientDisabled = true) do={ :if ($BridgePortVal->"disabled" = false || $DHCPClientDisabled = true) do={
$LogPrintExit2 info $0 ("Disabling bridge port for interface " . $BridgePortVal->"interface" . ", enabling dhcp client.") false; $LogPrint info $0 ("Disabling bridge port for interface " . $BridgePortVal->"interface" . ", enabling dhcp client.");
/interface/bridge/port/disable $BridgePort; /interface/bridge/port/disable $BridgePort;
:delay 200ms; :delay 200ms;
/ip/dhcp-client/enable $DHCPClient; /ip/dhcp-client/enable $DHCPClient;
@ -41,12 +42,13 @@
: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={ } on-error={
$LogPrintExit2 warning $0 ("Could not find VLAN '" . $Vlan . "' for interface " . $BridgePortVal->"interface" . "!") true; $LogPrint warning $0 ("Could not find VLAN '" . $Vlan . "' for interface " . $BridgePortVal->"interface" . "!");
:error false;
} }
} }
:if ($BridgePortVal->"disabled" = true || $Vlan != $BridgePortVal->"pvid") do={ :if ($BridgePortVal->"disabled" = true || $Vlan != $BridgePortVal->"pvid") do={
$LogPrintExit2 info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $ConfigTo . \ $LogPrint info $0 ("Enabling bridge port for interface " . $BridgePortVal->"interface" . ", changing to " . $ConfigTo . \
" vlan " . $Vlan . [ $IfThenElse ($Vlan != $VlanName) (" (" . $VlanName . ")") ] . ", disabling dhcp client.") false; " vlan " . $Vlan . [ $IfThenElse ($Vlan != $VlanName) (" (" . $VlanName . ")") ] . ", disabling dhcp client.");
:if ([ :len $DHCPClient ] = 1) do={ :if ([ :len $DHCPClient ] = 1) do={
/ip/dhcp-client/disable $DHCPClient; /ip/dhcp-client/disable $DHCPClient;
:delay 200ms; :delay 200ms;
@ -58,8 +60,8 @@
} }
/interface/bridge/port/set disabled=no pvid=$Vlan $BridgePort; /interface/bridge/port/set disabled=no pvid=$Vlan $BridgePort;
} else={ } else={
$LogPrintExit2 debug $0 ("Interface " . $BridgePortVal->"interface" . " already connected to " . $ConfigTo . \ $LogPrint debug $0 ("Interface " . $BridgePortVal->"interface" . " already connected to " . $ConfigTo . \
" vlan " . $Vlan . ".") false; " vlan " . $Vlan . ".");
} }
} }
} }
@ -67,7 +69,7 @@
} }
:if ([ :len $InterfaceReEnable ] > 0) do={ :if ([ :len $InterfaceReEnable ] > 0) do={
:delay 5s; :delay 5s;
$LogPrintExit2 info $0 ("Re-enabling interfaces...") false; $LogPrint info $0 ("Re-enabling interfaces...");
/interface/ethernet/enable $InterfaceReEnable; /interface/ethernet/enable $InterfaceReEnable;
} }
} }