mirror of
https://github.com/eworm-de/routeros-scripts
synced 2024-05-14 08:04:19 +00:00
daily-psk: move function GeneratePSK from global-functions
This commit is contained in:
parent
ba076db93e
commit
92bb1d107c
2 changed files with 41 additions and 43 deletions
42
daily-psk
42
daily-psk
|
@ -6,7 +6,47 @@
|
|||
|
||||
:global "daily-psk-match-comment";
|
||||
|
||||
:global "GeneratePSK";
|
||||
# return pseudo-random string for PSK
|
||||
:local GeneratePSK do={
|
||||
:local date $1;
|
||||
|
||||
:global "daily-psk-secrets";
|
||||
|
||||
:local months {
|
||||
"jan"; "feb"; "mar"; "apr"; "may"; "jun";
|
||||
"jul"; "aug"; "sep"; "oct"; "nov"; "dec"
|
||||
}
|
||||
:local monthtbl {
|
||||
0; 3; 3; 6; 1; 4; 6; 2; 5; 0; 3; 5
|
||||
}
|
||||
|
||||
:local monthstr [ :pick $date 0 3 ];
|
||||
:local month;
|
||||
:local day [ :pick $date 4 6 ];
|
||||
:local century [ :pick $date 7 9 ];
|
||||
:local year [ :pick $date 9 11 ];
|
||||
|
||||
# get numeric value for month
|
||||
:for mindex from=0 to=[ :len $months ] do={
|
||||
:if ([ :pick $months $mindex ] = $monthstr) do={
|
||||
:set month $mindex;
|
||||
}
|
||||
}
|
||||
|
||||
# calculate day of week
|
||||
:local sum 0;
|
||||
:set sum ($sum + (2 * (3 - ($century - (($century / 4) * 4)))));
|
||||
:set sum ($sum + ($year / 4));
|
||||
:set sum ($sum + $year + $day);
|
||||
:set sum ($sum + $month);
|
||||
:set sum ($sum - (($sum / 7) * 7));
|
||||
|
||||
:local return ([ :pick [ :pick $"daily-psk-secrets" 0 ] ($day - 1) ] . \
|
||||
[ :pick [ :pick $"daily-psk-secrets" 1 ] $month ] . \
|
||||
[ :pick [ :pick $"daily-psk-secrets" 2 ] $sum ]);
|
||||
|
||||
:return $return;
|
||||
}
|
||||
|
||||
# check mail server
|
||||
:if ([ / tool netwatch get [ find where comment=[ / tool e-mail get address ] ] status ] != "up" ) do={
|
||||
|
|
|
@ -4,48 +4,6 @@
|
|||
#
|
||||
# global functions
|
||||
|
||||
# return pseudo-random string for PSK
|
||||
:global GeneratePSK do={
|
||||
:local date $1;
|
||||
|
||||
:global "daily-psk-secrets";
|
||||
|
||||
:local months {
|
||||
"jan"; "feb"; "mar"; "apr"; "may"; "jun";
|
||||
"jul"; "aug"; "sep"; "oct"; "nov"; "dec"
|
||||
}
|
||||
:local monthtbl {
|
||||
0; 3; 3; 6; 1; 4; 6; 2; 5; 0; 3; 5
|
||||
}
|
||||
|
||||
:local monthstr [ :pick $date 0 3 ];
|
||||
:local month;
|
||||
:local day [ :pick $date 4 6 ];
|
||||
:local century [ :pick $date 7 9 ];
|
||||
:local year [ :pick $date 9 11 ];
|
||||
|
||||
# get numeric value for month
|
||||
:for mindex from=0 to=[ :len $months ] do={
|
||||
:if ([ :pick $months $mindex ] = $monthstr) do={
|
||||
:set month $mindex;
|
||||
}
|
||||
}
|
||||
|
||||
# calculate day of week
|
||||
:local sum 0;
|
||||
:set sum ($sum + (2 * (3 - ($century - (($century / 4) * 4)))));
|
||||
:set sum ($sum + ($year / 4));
|
||||
:set sum ($sum + $year + $day);
|
||||
:set sum ($sum + $month);
|
||||
:set sum ($sum - (($sum / 7) * 7));
|
||||
|
||||
:local return ([ :pick [ :pick $"daily-psk-secrets" 0 ] ($day - 1) ] . \
|
||||
[ :pick [ :pick $"daily-psk-secrets" 1 ] $month ] . \
|
||||
[ :pick [ :pick $"daily-psk-secrets" 2 ] $sum ]);
|
||||
|
||||
:return $return;
|
||||
}
|
||||
|
||||
# url encoding
|
||||
:global UrlEncode do={
|
||||
:local return "";
|
||||
|
|
Loading…
Reference in a new issue