summaryrefslogtreecommitdiff
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2011-05-18 09:50:06 +0000
committerJo-Philipp Wich <jow@openwrt.org>2011-05-18 09:50:06 +0000
commited8f726dabb07a11215c692b0887a14d8f2b55e4 (patch)
tree5f99b523e9f0ada4e9def70c9870e97c5cb379ea /package/base-files/files
parente35822050ba289a4e6db91d9e72c9504f84fee97 (diff)
downloadmtk-20170518-ed8f726dabb07a11215c692b0887a14d8f2b55e4.zip
mtk-20170518-ed8f726dabb07a11215c692b0887a14d8f2b55e4.tar.gz
mtk-20170518-ed8f726dabb07a11215c692b0887a14d8f2b55e4.tar.bz2
ipcalc.sh CIDR notation Hi,
the attached patch makes ipcalc.sh accept IP/Netmask combinations in CIDR notation. Before you could only do: # sh ipcalc.sh 192.168.0.0 255.255.255.0 1 10 IP=192.168.0.0 NETMASK=255.255.255.0 BROADCAST=192.168.0.255 NETWORK=192.168.0.0 PREFIX=24 START=192.168.0.1 END=192.168.0.11 with this patch you can also execute it with: sh ipcalc.sh 192.168.0.0/24 1 10 IP=192.168.0.0 NETMASK=255.255.255.0 BROADCAST=192.168.0.255 NETWORK=192.168.0.0 PREFIX=24 START=192.168.0.1 END=192.168.0.11 The patch is based on #1260 [1], i just changed one line to calculate the START end END ips right. I wonder why that never got included. If there is no reason not to do i would like to ask you to commit that patch, because its a functionality i (and probably others) miss quite often. Btw, i also fixed 4 useless tabs, that might look a bit strange in the patch. Regards, Manuel SVN-Revision: 26930
Diffstat (limited to 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/bin/ipcalc.sh21
1 files changed, 15 insertions, 6 deletions
diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index 9057e85..d6ef168 100755
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -23,15 +23,24 @@ function int2ip(ip,ret,x) {
}
BEGIN {
- ipaddr=ip2int(ARGV[1])
- netmask=ip2int(ARGV[2])
+ slpos=index(ARGV[1],"/")
+ if (slpos == 0) {
+ ipaddr=ip2int(ARGV[1])
+ netmask=ip2int(ARGV[2])
+ } else {
+ ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+ netmask=compl(2**(32-int(substr(ARGV[1],slpos+1)))-1)
+ ARGV[4]=ARGV[3]
+ ARGV[3]=ARGV[2]
+ }
+
network=and(ipaddr,netmask)
broadcast=or(network,compl(netmask))
-
+
start=or(network,and(ip2int(ARGV[3]),compl(netmask)))
limit=network+1
if (start<limit) start=limit
-
+
end=start+ARGV[4]
limit=or(network,compl(netmask))-1
if (end>limit) end=limit
@@ -41,10 +50,10 @@ BEGIN {
print "BROADCAST="int2ip(broadcast)
print "NETWORK="int2ip(network)
print "PREFIX="32-bitcount(compl(netmask))
-
+
# range calculations:
# ipcalc <ip> <netmask> <start> <num>
-
+
if (ARGC > 3) {
print "START="int2ip(start)
print "END="int2ip(end)