base-files: now that the initial password is completely empty (and not primed with...

[oweals/openwrt.git] / 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 e8efa6b96cf9c05f2b2689ebb462960cce236221..d6ef168706cb75c8c3a2a7ded04a2508166528ce 100755 (executable)
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -1,16 +1,46 @@
 #!/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)
+       c=and(rshift(c, 4),0x0f0f0f0f)+and(c,0x0f0f0f0f)
+       c=and(rshift(c, 8),0x00ff00ff)+and(c,0x00ff00ff)
+       c=and(rshift(c,16),0x0000ffff)+and(c,0x0000ffff)
+       return c
+}
+
+function ip2int(ip) {
+       for (ret=0,n=split(ip,a,"\."),x=1;x<=n;x++) ret=or(lshift(ret,8),a[x]) 
+       return ret
+}
+
+function int2ip(ip,ret,x) {
+       ret=and(ip,255)
+       ip=rshift(ip,8)
+       for(;x<3;ret=and(ip,255)"."ret,ip=rshift(ip,8),x++);
+       return ret
+}
+
 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
@@ -20,13 +50,13 @@ 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-1)
+               print "END="int2ip(end)
        }
 }
 EOF