[backfire] merge r26930

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26931 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 7557d3c295b24b7090124fea4664fc9421d292aa..89be4a1c988d9a3ea74ede992e4133683cee5805 100644 (file)
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files

-PKG_RELEASE:=43.16
+PKG_RELEASE:=43.17

 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host

diff --git a/package/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
index 318980e5a25f25de5cc53d065faf8571228af8a6..0cd6e14f09f7ea92c9b6db72fca936787cb0731f 100755 (executable)
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -2,15 +2,24 @@
 
 awk -f /usr/lib/common.awk -f - $* <<EOF
 BEGIN {
 
 awk -f /usr/lib/common.awk -f - $* <<EOF
 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))
        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
        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
        end=start+ARGV[4]
        limit=or(network,compl(netmask))-1
        if (end>limit) end=limit


@@ -20,10 +29,10 @@ BEGIN {
        print "BROADCAST="int2ip(broadcast)
        print "NETWORK="int2ip(network)
        print "PREFIX="32-bitcount(compl(netmask))
        print "BROADCAST="int2ip(broadcast)
        print "NETWORK="int2ip(network)
        print "PREFIX="32-bitcount(compl(netmask))

-       
+

        # range calculations:
        # ipcalc <ip> <netmask> <start> <num>
        # range calculations:
        # ipcalc <ip> <netmask> <start> <num>

-       
+

        if (ARGC > 3) {
                print "START="int2ip(start)
                print "END="int2ip(end)
        if (ARGC > 3) {
                print "START="int2ip(start)
                print "END="int2ip(end)