From 8b05d254871f5c04184aca6c992b1871fc8f98b8 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Fri, 17 Sep 2021 16:23:53 +0200 Subject: global-functions: move $IPCalc to optional module --- global-functions | 30 ------------------------------ global-functions.d/ipcalc | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 global-functions.d/ipcalc diff --git a/global-functions b/global-functions index e6b6527..1a13588 100644 --- a/global-functions +++ b/global-functions @@ -32,7 +32,6 @@ :global GetRandomNumber; :global HexToNum; :global IfThenElse; -:global IPCalc; :global LogPrintExit; :global LogPrintExit2; :global MkDir; @@ -440,35 +439,6 @@ :return $3; } -# calculate and print netmask, network, min host, max host and broadcast -:set IPCalc do={ - :local Input [ :tostr $1 ]; - :local Address [ :toip [ :pick $Input 0 [ :find $Input "/" ] ] ]; - :local Bits [ :tonum [ :pick $Input ([ :find $Input "/" ] + 1) [ :len $Input ] ] ]; - :local Mask ((255.255.255.255 << (32 - $Bits)) & 255.255.255.255); - - :local Return { - "address"=$Address; - "netmask"=$Mask; - "networkaddress"=($Address & $Mask); - "networkbits"=$Bits; - "network"=(($Address & $Mask) . "/" . $Bits); - "hostmin"=(($Address & $Mask) | 0.0.0.1); - "hostmax"=(($Address | ~$Mask) ^ 0.0.0.1); - "broadcast"=($Address | ~$Mask); - } - - :put ( \ - "Address: " . $Return->"address" . "\n\r" . \ - "Netmask: " . $Return->"netmask" . "\n\r" . \ - "Network: " . $Return->"network" . "\n\r" . \ - "HostMin: " . $Return->"hostmin" . "\n\r" . \ - "HostMax: " . $Return->"hostmax" . "\n\r" . \ - "Broadcast: " . $Return->"broadcast"); - - :return $Return; -} - # deprecated compatibility wrapper :set LogPrintExit do={ :global LogPrintExit2; diff --git a/global-functions.d/ipcalc b/global-functions.d/ipcalc new file mode 100644 index 0000000..f146fbe --- /dev/null +++ b/global-functions.d/ipcalc @@ -0,0 +1,35 @@ +#!rsc by RouterOS +# RouterOS script: global-functions.d/ipcalc +# Copyright (c) 2020-2021 Christian Hesse +# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md + +:global IPCalc; + +# calculate and print netmask, network, min host, max host and broadcast +:set IPCalc do={ + :local Input [ :tostr $1 ]; + :local Address [ :toip [ :pick $Input 0 [ :find $Input "/" ] ] ]; + :local Bits [ :tonum [ :pick $Input ([ :find $Input "/" ] + 1) [ :len $Input ] ] ]; + :local Mask ((255.255.255.255 << (32 - $Bits)) & 255.255.255.255); + + :local Return { + "address"=$Address; + "netmask"=$Mask; + "networkaddress"=($Address & $Mask); + "networkbits"=$Bits; + "network"=(($Address & $Mask) . "/" . $Bits); + "hostmin"=(($Address & $Mask) | 0.0.0.1); + "hostmax"=(($Address | ~$Mask) ^ 0.0.0.1); + "broadcast"=($Address | ~$Mask); + } + + :put ( \ + "Address: " . $Return->"address" . "\n\r" . \ + "Netmask: " . $Return->"netmask" . "\n\r" . \ + "Network: " . $Return->"network" . "\n\r" . \ + "HostMin: " . $Return->"hostmin" . "\n\r" . \ + "HostMax: " . $Return->"hostmax" . "\n\r" . \ + "Broadcast: " . $Return->"broadcast"); + + :return $Return; +} -- cgit v1.2.3-54-g00ecf