MFC 12257

Ticket #965  - fix wake on lan from diag_dhcp_leases.php if it's a static dhcp lease

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}&nbsp;</td>\n";