aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Christian Hesse <mail@eworm.de>2024-01-29 22:32:57 +0100
committerGravatar Christian Hesse <mail@eworm.de>2024-01-30 00:02:08 +0100
commita1abfedccd62251e9540afa882ed9e47e357e486 (patch)
tree4fba4197f994101581f39fea6adb5379437dbdbb
parent16898ae997df8ff9c165f54944a85b5f3d07d2dc (diff)
global-functions: $RandomDelay: always scale to ms...routeros-7.12-1
... to randomize in friction of unit. This requires :tonsec from RouterOS 7.12.
-rw-r--r--README.md2
-rw-r--r--global-functions.rsc5
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index db1138b..b23310a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ RouterOS Scripts
[![GitHub stars](https://img.shields.io/github/stars/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=red)](https://github.com/eworm-de/routeros-scripts/stargazers)
[![GitHub forks](https://img.shields.io/github/forks/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=green)](https://github.com/eworm-de/routeros-scripts/network)
[![GitHub watchers](https://img.shields.io/github/watchers/eworm-de/routeros-scripts?logo=GitHub&style=flat&color=blue)](https://github.com/eworm-de/routeros-scripts/watchers)
-[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.10-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
+[![required RouterOS version](https://img.shields.io/badge/RouterOS-7.12-yellow?style=flat)](https://mikrotik.com/download/changelogs/)
[![Telegram group @routeros_scripts](https://img.shields.io/badge/Telegram-%40routeros__scripts-%2326A5E4?logo=telegram&style=flat)](https://t.me/routeros_scripts)
[![donate with PayPal](https://img.shields.io/badge/Like_it%3F-Donate!-orange?logo=githubsponsors&logoColor=orange&style=flat)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=A4ZXBD6YS2W8J)
diff --git a/global-functions.rsc b/global-functions.rsc
index a2c50a5..9be7893 100644
--- a/global-functions.rsc
+++ b/global-functions.rsc
@@ -4,7 +4,7 @@
# Michael Gisbers <michael@gisbers.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
#
-# requires RouterOS, version=7.10beta5
+# requires RouterOS, version=7.12
#
# global functions
# https://git.eworm.de/cgit/routeros-scripts/about/
@@ -878,12 +878,13 @@
:global EitherOr;
:global GetRandomNumber;
+ :global MAX;
:if ($Time = 0) do={
:return false;
}
- :delay ([ $GetRandomNumber $Time ] . [ $EitherOr $Unit "s" ]);
+ :delay ([ $MAX 10 [ $GetRandomNumber ([ :tonsec [ :totime ($Time . [ $EitherOr $Unit "s" ]) ] ] / 1000000) ] ] . "ms");
}
# check for required RouterOS version