From 9c070452ce9e1aa294965bb1359903c958222e96 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 21 Sep 2011 16:32:43 -0400
Subject: Fix interface finding. Now properly adds a dhcpv6 static mapping via
 + button.

---
 usr/local/www/status_dhcpv6_leases.php | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'usr/local/www')

diff --git a/usr/local/www/status_dhcpv6_leases.php b/usr/local/www/status_dhcpv6_leases.php
index ea86957..6153259 100644
--- a/usr/local/www/status_dhcpv6_leases.php
+++ b/usr/local/www/status_dhcpv6_leases.php
@@ -374,7 +374,7 @@ foreach ($leases as $data) {
 		} else {
 			$fspans = $fspane = "";
 		}
-                // $lip = ip2ulong($data['ip']);
+
 		if ($data['act'] == "static") {
 			foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
 				if(is_array($dhcpifconf['staticmap'])) {
@@ -390,12 +390,7 @@ foreach ($leases as $data) {
 					break;
 			}
 		} else {
-                	foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {	
-                        	if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) {
-                                	$data['if'] = $dhcpif;
-                                	break;
-                        	}
-			}
+			$data['if'] = convert_real_interface_to_friendly_interface_name(guess_interface_from_ip($data['ip']));
                 }		
 		echo "<tr>\n";
                 echo "<td class=\"listlr\">{$fspans}{$data['ip']}{$fspane}&nbsp;</td>\n";
-- 
cgit v1.1