projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[backfire] merge r26930
[openwrt-10.03/.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 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)