From 261f2efe47a52a0d9a1756cf53f92c7d2148a40c Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Tue, 4 Nov 2014 19:57:46 -0600
Subject: fix NAT-T status. The 'nat' in the status array just tells how the
 connection is configured, not what it's actually using. Port seems to be the
 best way to determine what it's using. Fix up some other text while here

---
 usr/local/www/diag_ipsec.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'usr/local/www/diag_ipsec.php')

diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index 0f4e2ef..18686d0 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -161,7 +161,7 @@ $status = ipsec_smp_dump_status();
 							gettext('Port: ') . htmlspecialchars($ikesa['local']['port']);
 					else
 						echo gettext("Unknown");
-					if ($ikesa['local']['nat'] != 'false')
+					if ($ikesa['local']['port'] == '4500')
 						echo " NAT-T";
 				}
 ?>
@@ -201,7 +201,7 @@ $status = ipsec_smp_dump_status();
 							gettext('Port: ') . htmlspecialchars($ikesa['remote']['port']);
 					else
 						echo gettext("Unknown");
-					if ($ikesa['remote']['nat'] != 'false')
+					if ($ikesa['remote']['port'] == '4500')
 						echo " NAT-T";
 				}
 ?>
@@ -446,8 +446,8 @@ $status = ipsec_smp_dump_status();
 ?>
 				<td class="listr">
 					<center>
-						<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_pass.gif" title=<?php echo gettext("Waiting connections");?> alt=""/>
-						<br/><?php echo gettext("Waiting connections");?>
+						<img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_pass.gif" title=<?php echo gettext("Awaiting connections");?> alt=""/>
+						<br/><?php echo gettext("Awaiting connections");?>
 					</center>
 				</td>
 				<td valign="middle" class="list nowrap">
-- 
cgit v1.1