Robot/contrib-munin
2
0
Fork 0
mirror of https://github.com/munin-monitoring/contrib.git synced 2018-11-08 00:59:34 +01:00
Code Issues Releases Wiki Activity

dhcp-pool: Fix off-by-one error in pool size.

Browse Source 
"range" statement gives the lowest and highest IP addresses (both
inclusive) in a pool. dhcp-pool did not count the highest address
when calculating pool size.
This commit is contained in:
Tomaz Solc 2016-10-01 09:25:51 +02:00
parent a582c4bae2
commit 316a59e156
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/network/dhcp-pool
View File

@ -73,7 +73,7 @@ else {
# For each pool, count how many leases from that pool are currently active # For each pool, count how many leases from that pool are currently active
foreach $start (keys %pools) { foreach $start (keys %pools) {
$size = $pools{$start}; $size = $pools{$start};
$end = $start+$size; $end = $start+$size-1;
$free = $size; $free = $size;
foreach $lease (@activeleases) { foreach $lease (@activeleases) {
@ -103,9 +103,12 @@ sub determine_pools {
if ($line =~ /range[\s]+([\d]+\.[\d]+\.[\d]+\.[\d]+)[\s]+([\d]+\.[\d]+\.[\d]+\.[\d]+)/) { if ($line =~ /range[\s]+([\d]+\.[\d]+\.[\d]+\.[\d]+)[\s]+([\d]+\.[\d]+\.[\d]+\.[\d]+)/) {
$start = string2ip($1); $start = string2ip($1);
$end = string2ip($2); $end = string2ip($2);
$size = $end - $start;
defined($start) || next; defined($start) || next;
defined($end) || next; defined($end) || next;
# The range statement gives the lowest and highest IP addresses in a range.
$size = $end - $start + 1;
$pools{$start} = $size; $pools{$start} = $size;
} }