mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show correct availavble usable range and disallow using network or broadcast address. Ticket #145

Browse Source
This commit is contained in:
sullrich 2009-12-02 19:04:16 -05:00
parent 26e3ca704c
commit c9eca74f2b
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
usr/local/www/services_dhcp.php
View File

@ -228,6 +228,9 @@ if ($_POST) {
if(gen_subnet_max($ifcfgip, $ifcfgsn) == $_POST['range_to'])
$input_errors[] = "You cannot use the broadcast address in the ending subnet range.";
//if(is_inrange($ifcfgip, $_POST['range_from'], $_POST['range_to']))
// $input_errors[] = "Address range includes the interface IP $ifcfgip.";
if (!$input_errors) {
/* make sure the range lies within the current subnet */
$subnet_start = (ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn));
@ -511,19 +514,25 @@ include("head.inc");
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Subnet
mask</td>
<td width="22%" valign="top" class="vncellreq">Subnet mask</td>
<td width="78%" class="vtable">
<?=gen_subnet_mask($ifcfgsn);?>
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vncellreq">Available
range</td>
<td width="22%" valign="top" class="vncellreq">Available range</td>
<td width="78%" class="vtable">
<?=long2ip(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn));?>
<?php
$range_from = ip2long(long2ip(ip2long($ifcfgip) & gen_subnet_mask_long($ifcfgsn)));
$range_from++;
echo long2ip($range_from);
?>
-
<?=long2ip(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))); ?>
<?php
$range_to = ip2long(long2ip(ip2long($ifcfgip) | (~gen_subnet_mask_long($ifcfgsn))));
$range_to--;
echo long2ip($range_to);
?>
</td>
</tr>
<?php if($is_olsr_enabled): ?>