summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2015-11-09 10:54:48 -0200
committerRenato Botelho <renato@netgate.com>2015-11-09 10:56:59 -0200
commitadc7124bc896dd36b0abe4c91af154bb416df6ed (patch)
treed2d15c4921bf0ee458d7a9a1e3d377f4bbc76b46
parenteb836ace21fd416ff7231d6aa321a7e28fb88878 (diff)
downloadpfsense-adc7124bc896dd36b0abe4c91af154bb416df6ed.zip
pfsense-adc7124bc896dd36b0abe4c91af154bb416df6ed.tar.gz
Let the code ready for strongswan 5.3.4, where key used to track nat were committed with a different name
-rw-r--r--usr/local/www/diag_ipsec.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index fd7c0db..bfbad2f 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -201,7 +201,13 @@ $status = ipsec_list_sa();
} else {
echo 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'))) {
echo " NAT-T";
}
@@ -239,7 +245,13 @@ $status = ipsec_list_sa();
} else {
echo 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'))) {
echo " NAT-T";
}
?>
OpenPOWER on IntegriCloud