summaryrefslogtreecommitdiffstats
path: root/src
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:55:04 -0200
commit936bfb38e818923d94bd640df2a993f59b3fd072 (patch)
tree934e7ee0ad22a014260e9b8ec4e63652f1d4ccfc /src
parent6f3a6c317d79812ad3a30f3eec187e8b04c7e472 (diff)
downloadpfsense-936bfb38e818923d94bd640df2a993f59b3fd072.zip
pfsense-936bfb38e818923d94bd640df2a993f59b3fd072.tar.gz
Let the code ready for strongswan 5.3.4, where key used to track nat were committed with a different name
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/diag_ipsec.php16
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");
}
?>
OpenPOWER on IntegriCloud