X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/1c53c804001aeefd8ec5663511f8e973a2622c40..HEAD:/package/base-files/files/bin/ipcalc.sh

diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index e4826672e..d6ef16870 100755
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-awk -f /usr/lib/common.awk -f - $* <<EOF
+awk -f - $* <<EOF
 function bitcount(c) {
 	c=and(rshift(c, 1),0x55555555)+and(c,0x55555555)
 	c=and(rshift(c, 2),0x33333333)+and(c,0x33333333)
@@ -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)