michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Show leases inside shared networks as well https://sourceforge.net/p/webadmin/bugs/5534/

Browse Source
This commit is contained in:
Jamie Cameron
2021-12-23 21:47:44 -08:00
parent a37b82d0d1
commit 134311032e
1 changed files with 34 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dhcpd/list_leases.cgi
View File

@@ -23,8 +23,21 @@ print "Refresh: $config{'lease_refresh'}\r\n"
%ranges = ( );
$conf = &get_config();
@subnets = &find("subnet", $conf);
foreach $shared (&find("shared-network", $conf)) {
@shareds = &find("shared-network", $conf);
foreach $shared (@shareds) {
push(@subnets, &find("subnet", $shared->{'members'}));
@ranges = &find("range", $shared->{'members'});
foreach $pool (&find("pool", $shared->{'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])) {
$ranges{$ip} = $shared;
$shared->{'ips'}++;
}
}
}
foreach $subnet (@subnets) {
if ($in{'network'}) {
@@ -111,7 +124,7 @@ else {
}
if ($in{'bysubnet'}) {
# Show table of subnets, with lease usage
# Show table of subnets and shared nets, with lease usage
print &ui_columns_start([
$text{'index_net'}, $text{'index_desc'},
$text{'listl_size'}, $text{'listl_used'},
@@ -135,6 +148,25 @@ else {
"",
]);
}
foreach $shared (grep { $_->{'ips'} } @shareds) {
%used = ( );
foreach $lease (@leases) {
$r = $ranges{$lease->{'values'}->[0]};
if ($r eq $shared && !$lease->{'expired'}) {
$used{$lease->{'values'}->[0]}++;
}
}
$used = scalar(keys %used);
print &ui_columns_row([
$shared->{'values'}->[0],
&html_escape($shared->{'comment'}),
$shared->{'ips'},
$used,
$shared->{'ips'} ?
int(100*$used / $shared->{'ips'})."%" :
"",
]);
}
print &ui_columns_end();
}
elsif (@leases) {