X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fbin%2Fipcalc.sh;h=5d5eac3ea80b8e0b9a11ff6139d701a9618a8149;hp=e4826672e8ac3f749983f1e8aaa027b17614f020;hb=ec907455d3be7ec0200e229b7a5a57e931b3c7cd;hpb=1c53c804001aeefd8ec5663511f8e973a2622c40

diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index e4826672e8..5d5eac3ea8 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)
@@ -11,7 +11,7 @@ function bitcount(c) {
 }
 
 function ip2int(ip) {
-	for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) 
+	for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x])
 	return ret
 }
 
@@ -22,29 +22,47 @@ function int2ip(ip,ret,x) {
 	return ret
 }
 
+function compl32(v) {
+	ret=xor(v, 0xffffffff)
+	return ret
+}
+
 BEGIN {
-	ipaddr=ip2int(ARGV[1])
-	netmask=ip2int(ARGV[2])
+	slpos=index(ARGV[1],"/")
+	if (slpos == 0) {
+		ipaddr=ip2int(ARGV[1])
+		dotpos=index(ARGV[2],".")
+		if (dotpos == 0)
+			netmask=compl32(2**(32-int(ARGV[2]))-1)
+		else
+			netmask=ip2int(ARGV[2])
+	} else {
+		ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
+		netmask=compl32(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)))
+	broadcast=or(network,compl32(netmask))
+
+	start=or(network,and(ip2int(ARGV[3]),compl32(netmask)))
 	limit=network+1
 	if (start<limit) start=limit
-	
+
 	end=start+ARGV[4]
-	limit=or(network,compl(netmask))-1
+	limit=or(network,compl32(netmask))-1
 	if (end>limit) end=limit
 
 	print "IP="int2ip(ipaddr)
 	print "NETMASK="int2ip(netmask)
 	print "BROADCAST="int2ip(broadcast)
 	print "NETWORK="int2ip(network)
-	print "PREFIX="32-bitcount(compl(netmask))
-	
+	print "PREFIX="32-bitcount(compl32(netmask))
+
 	# range calculations:
 	# ipcalc <ip> <netmask> <start> <num>
-	
+
 	if (ARGC > 3) {
 		print "START="int2ip(start)
 		print "END="int2ip(end)