base-files: ipcalc.sh: don't include own address in range

[openwrt/staging/dedeckeh.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 9b2c4d2afc851f32ad90b73f0bf15761278615e9..66d37952de8ee02a37320efdebe7fabfc6513ab9 100755 (executable)
--- a/package/base-files/files/bin/ipcalc.sh
+++ b/package/base-files/files/bin/ipcalc.sh
@@ -61,10 +61,17 @@ BEGIN {
        start=or(network,and(ip2int(ARGV[3]),compl32(netmask)))
        limit=network+1
        if (start<limit) start=limit
+       if (start==ipaddr) start=ipaddr+1
 
        end=start+ARGV[4]
        limit=or(network,compl32(netmask))-1
        if (end>limit) end=limit
+       if (end==ipaddr) end=ipaddr-1
+
+       if (ipaddr > start && ipaddr < end) {
+               print "ipaddr inside range" > "/dev/stderr"
+               exit(1)
+       }
 
        print "START="int2ip(start)
        print "END="int2ip(end)