Handle ranges in pools
authorJamie Cameron <jcameron@webmin.com>
Thu, 30 Jul 2009 18:13:36 +0000 (11:13 -0700)
committerJamie Cameron <jcameron@webmin.com>
Thu, 30 Jul 2009 18:13:36 +0000 (11:13 -0700)
dhcpd/list_leases.cgi

index 566939d..6c6029f 100755 (executable)
@@ -33,7 +33,11 @@ foreach $subnet (@subnets) {
                        }
                }
        $subnet->{'ips'} = 0;
-       foreach $range (&find("range", $subnet->{'members'})) {
+       @ranges = &find("range", $subnet->{'members'});
+       foreach $pool (&find("pool", $subnet->{'members'})) {
+               push(@ranges, &find("range", $pool->{'members'}));
+               }
+       foreach $range (@ranges) {
                local @rv = @{$range->{'values'}};
                shift(@rv) if ($rv[0] eq "dynamic-bootp");
                foreach $ip (&expand_ip_range($rv[0], $rv[1])) {