From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 18 May 2011 09:51:33 +0000 (+0000)
Subject: [backfire] merge r26930
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=d289b51bacbc9f8e512df658ce1e9b8940e17ec4;hp=7e24d93f43a999788310886fc3e33d9e66170671

[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 7557d3c29..89be4a1c9 100644
--- 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
-PKG_RELEASE:=43.16
+PKG_RELEASE:=43.17
 
 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 318980e5a..0cd6e14f0 100755
--- 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 {
-	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,10 +29,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)