qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 22:05:20 +02:00
Code

base-files: ipcalc.sh: fix broken calculations on 64bit systems

Browse Source 
Calculate complements by using awk's xor() function with a mask of 0xffffffff
instead of relying on the compl() function which appears to produce broken
results on certain 64bit architectures.

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34875 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2012-12-23 22:18:43 +00:00
parent bb460376f5
commit afc4535cfc
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
package/base-files/files/bin/ipcalc.sh
View File

@ -22,6 +22,11 @@ function int2ip(ip,ret,x) {
return ret return ret
} }
function compl32(v) {
ret=xor(v, 0xffffffff)
return ret
}
BEGIN { BEGIN {
slpos=index(ARGV[1],"/") slpos=index(ARGV[1],"/")
if (slpos == 0) { if (slpos == 0) {
@ -29,27 +34,27 @@ BEGIN {
netmask=ip2int(ARGV[2]) netmask=ip2int(ARGV[2])
} else { } else {
ipaddr=ip2int(substr(ARGV[1],0,slpos-1)) ipaddr=ip2int(substr(ARGV[1],0,slpos-1))
netmask=compl(2**(32-int(substr(ARGV[1],slpos+1)))-1) netmask=compl32(2**(32-int(substr(ARGV[1],slpos+1)))-1)
ARGV[4]=ARGV[3] ARGV[4]=ARGV[3]
ARGV[3]=ARGV[2] ARGV[3]=ARGV[2]
} }
network=and(ipaddr,netmask) network=and(ipaddr,netmask)
broadcast=or(network,compl(netmask)) broadcast=or(network,compl32(netmask))
start=or(network,and(ip2int(ARGV[3]),compl(netmask))) start=or(network,and(ip2int(ARGV[3]),compl32(netmask)))
limit=network+1 limit=network+1
if (start<limit) start=limit if (start<limit) start=limit
end=start+ARGV[4] end=start+ARGV[4]
limit=or(network,compl(netmask))-1 limit=or(network,compl32(netmask))-1
if (end>limit) end=limit if (end>limit) end=limit
print "IP="int2ip(ipaddr) print "IP="int2ip(ipaddr)
print "NETMASK="int2ip(netmask) print "NETMASK="int2ip(netmask)
print "BROADCAST="int2ip(broadcast) print "BROADCAST="int2ip(broadcast)
print "NETWORK="int2ip(network) print "NETWORK="int2ip(network)
print "PREFIX="32-bitcount(compl(netmask)) print "PREFIX="32-bitcount(compl32(netmask))
# range calculations: # range calculations:
# ipcalc <ip> <netmask> <start> <num> # ipcalc <ip> <netmask> <start> <num>