Usage by subnet display

diff --git a/dhcpd/CHANGELOG b/dhcpd/CHANGELOG
index e0a40c3..bf4ec86 100644 (file)
--- a/dhcpd/CHANGELOG
+++ b/dhcpd/CHANGELOG
@@ -34,3 +34,4 @@ String custom options are now always quoted.
 ---- Changes since 1.480 ----
 Converted buttons on the module's main page to use the Webmin UI library.
 Expired leases are no longer counted towards usage on the DHCP Leases page.
+Added a mode to the DHCP Leases page to show usage by subnet, thanks to a suggestion by Coles.

diff --git a/dhcpd/lang/en b/dhcpd/lang/en
index 4757a5b..e59a9b2 100644 (file)
--- a/dhcpd/lang/en
+++ b/dhcpd/lang/en
@@ -155,6 +155,12 @@ listl_all=List all active and expired leases
 listl_delete=Click on a lease IP address from the list above to delete it.
 listl_unknown=Unknown
 listl_allocs=$1 IP addresses available, $2 allocated ($3 %)
+listl_mode=Display mode :
+listl_mode_0=DHCP leases
+listl_mode_1=Subnets and usage
+listl_size=Total IPs
+listl_used=Allocated
+listl_pc=Percentage
 
 restart_errmsg1=Failed to restart dhcpd
 restart_errmsg2=Failed to signal process

diff --git a/dhcpd/list_leases.cgi b/dhcpd/list_leases.cgi
index 36a308a..7abd666 100755 (executable)
--- a/dhcpd/list_leases.cgi
+++ b/dhcpd/list_leases.cgi
@@ -26,13 +26,15 @@ foreach $shared (&find("shared-network", $conf)) {
        push(@subnets, &find("subnet", $shared->{'members'}));
        }
 foreach $subnet (@subnets) {
+       $subnet->{'ips'} = 0;
        foreach $range (&find("range", $subnet->{'members'})) {
                local @rv = @{$range->{'values'}};
                shift(@rv) if ($rv[0] eq "dynamic-bootp");
                foreach $ip (&expand_ip_range($rv[0], $rv[1])) {
                        if (&within_network($ip)) {
-                               $ranges{$ip}++;
+                               $ranges{$ip} = $subnet;
                                }
+                       $subnet->{'ips'}++;
                        }
                }
        }
@@ -46,6 +48,7 @@ elsif (!&tokenize_file($config{'lease_file'}, \@tok)) {
        print "<b>",&text('listl_lfnotcont',$config{'lease_file'}),"</b><p>\n";
        }
 else {
+       # Parse lease file
        $i = $j = 0;
        local @nw = split(/\./, $in{'network'});
        local @nm = split(/\./, $in{'netmask'});
@@ -65,7 +68,48 @@ else {
                next if (!&within_network($lease->{'values'}->[0]));
                push(@leases, $lease);
                }
-       if (@leases) {
+
+       # Show links to select mode, if not showing a single subnet
+       if (!$in{'network'}) {
+               @links = ( );
+               foreach $m (0, 1) {
+                       $msg = $text{'listl_mode_'.$m};
+                       if ($m != $in{'bysubnet'}) {
+                               $msg = "<a href='list_leases.cgi?bysubnet=$m'>".
+                                      "$msg</a>";
+                               }
+                       push(@links, $msg);
+                       }
+               print "<b>$text{'listl_mode'}</b> ",
+                     &ui_links_row(\@links),"<br>\n";
+               }
+
+       if ($in{'bysubnet'}) {
+               # Show table of subnets, with lease usage
+               print &ui_columns_start([
+                       $text{'index_net'}, $text{'index_desc'},
+                       $text{'listl_size'}, $text{'listl_used'}, 
+                       $text{'listl_pc'} ], 100);
+               foreach $subnet (@subnets) {
+                       %used = ( );
+                       foreach $lease (@leases) {
+                               $r = $ranges{$lease->{'values'}->[0]};
+                               if ($r eq $subnet && !$lease->{'expired'}) {
+                                       $used{$lease->{'values'}->[0]}++;
+                                       }
+                               }
+                       $used = scalar(keys %used);
+                       print &ui_columns_row([
+                               $subnet->{'values'}->[0],
+                               &html_escape($subnet->{'comment'}),
+                               $subnet->{'ips'},
+                               $used,
+                               int(100*$used / $subnet->{'ips'})."%",
+                               ]);
+                       }
+               print &ui_columns_end();
+               }
+       elsif (@leases) {
                # Sort leases by selected type
                if ($in{'sort'} eq 'ipaddr') {
                        @leases = sort { &ip_compare($a, $b) } @leases;
@@ -158,7 +202,7 @@ else {
                                  'listl_lfnotcont2', $config{'lease_file'}),
                      "</b><p>\n";
                }
-       if (!$in{'all'}) {
+       if (!$in{'all'} && !$in{'bysubnet'}) {
                print &ui_form_start("list_leases.cgi");
                print &ui_hidden("all", 1);
                print &ui_hidden("network", $in{'network'});