diff options
Diffstat (limited to 'modules-available/dnbd3/inc/dnbd3util.inc.php')
| -rw-r--r-- | modules-available/dnbd3/inc/dnbd3util.inc.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/modules-available/dnbd3/inc/dnbd3util.inc.php b/modules-available/dnbd3/inc/dnbd3util.inc.php index 47d7a4ea..7d95147a 100644 --- a/modules-available/dnbd3/inc/dnbd3util.inc.php +++ b/modules-available/dnbd3/inc/dnbd3util.inc.php @@ -136,13 +136,10 @@ class Dnbd3Util { array('locs' => array_values($recursiveLocs))); // Coalesce overlapping ranges $floatIp = ip2long($self); // Float for 32bit php :/ - if (PHP_INT_SIZE === 4) { - $floatIp = (float)sprintf('%u', $floatIp); // Float for 32bit php :/ - } $ranges = [['startaddr' => $floatIp, 'endaddr' => $floatIp]]; foreach ($res as $row) { - settype($row['startaddr'], PHP_INT_SIZE === 4 ? 'float' : 'int'); - settype($row['endaddr'], PHP_INT_SIZE === 4 ? 'float' : 'int'); + settype($row['startaddr'], 'int'); + settype($row['endaddr'], 'int'); self::mergeRanges($ranges, $row); } // Got subnets, build whitelist @@ -215,11 +212,7 @@ class Dnbd3Util { */ private static function range2Cidr(int $start, int $end): string { - if (PHP_INT_SIZE > 4) { - $bin = decbin($start ^ $end); - } else { - $bin = decbin((int)(float)$start ^ (int)(float)$end); - } + $bin = decbin($start ^ $end); if ($bin === '0') return long2ip($start); $mask = 32 - strlen($bin); |