Let the code ready for strongswan 5.3.4, where key used to track nat were committed with a different name

1 files changed, 14 insertions, 2 deletions

diff --git a/src/usr/local/www/diag_ipsec.php b/src/usr/local/www/diag_ipsec.php
index a233168..3528fa9 100644
--- a/src/usr/local/www/diag_ipsec.php
+++ b/src/usr/local/www/diag_ipsec.php
@@ -194,7 +194,13 @@ if (is_array($status)) {
 		} else {
 			print(gettext("Unknown"));
 		}
-		if (isset($ikesa['local-nat-t'])) {
+		/*
+		 * XXX: local-nat-t was defined by pfSense
+		 * When strongswan team accepted the change, they changed it to
+		 * nat-local. Keep both for a while and remove local-nat-t in
+		 * the future
+		 */
+		if (isset($ikesa['local-nat-t']) || isset($ikesa('nat-local'))) {
 			print(" NAT-T");
 		}
 ?>
@@ -231,7 +237,13 @@ if (is_array($status)) {
 		} else {
 			print(gettext("Unknown"));
 		}
-		if (isset($ikesa['remote-nat-t'])) {
+		/*
+		 * XXX: remote-nat-t was defined by pfSense
+		 * When strongswan team accepted the change, they changed it to
+		 * nat-remote. Keep both for a while and remove remote-nat-t in
+		 * the future
+		 */
+		if (isset($ikesa['remote-nat-t']) || isset($ikesa['nat-remote'])) {
 			print(" NAT-T");
 		}
 ?>