diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2006-05-16 23:04:19 +0000 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2006-05-16 23:04:19 +0000 |
commit | 5b2177e43d2c0c12400b3edb1b865853423d0a1d (patch) | |
tree | b36536dea438287e2d3df71bda1ae25c5444c44e /usr/local/www | |
parent | 9cde954b25facaf94e3249379305ce5d6e6df5e4 (diff) | |
download | pfsense-5b2177e43d2c0c12400b3edb1b865853423d0a1d.zip pfsense-5b2177e43d2c0c12400b3edb1b865853423d0a1d.tar.gz |
MFC 12257
Ticket #965 - fix wake on lan from diag_dhcp_leases.php if it's a static dhcp lease
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/diag_dhcp_leases.php | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index 0f01b7a..2c6cc8d 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -227,11 +227,25 @@ foreach ($leases as $data) { $fspans = $fspane = ""; } $lip = ip2long($data['ip']); - foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { - if (($lip >= ip2long($dhcpifconf['range']['from'])) && ($lip <= ip2long($dhcpifconf['range']['to']))) { - $data['if'] = $dhcpif; - break; - } + if ($data['act'] == "static") { + foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { + foreach ($dhcpifconf['staticmap'] as $staticent) { + if ($data['ip'] == $staticent['ipaddr']) { + $data['if'] = $dhcpif; + break; + } + } + /* exit as soon as we have an interface */ + if ($data['if'] != "") + break; + } + } else { + foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { + if (($lip >= ip2long($dhcpifconf['range']['from'])) && ($lip <= ip2long($dhcpifconf['range']['to']))) { + $data['if'] = $dhcpif; + break; + } + } } echo "<tr>\n"; echo "<td class=\"listlr\">{$fspans}{$data['ip']}{$fspane} </td>\n"; |