summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorGraham Collinson <graham.collinson@rdb-concepts.com>2017-02-10 13:18:07 +0000
committerRenato Botelho <renato@netgate.com>2017-02-10 15:39:26 -0200
commit3093b9653527806a34bf758b03ee395ec1639692 (patch)
tree807353c791e36ec3a6f50ac85993b304517eb738 /src/usr
parente86b541ff348e2ca5274b51d986005182d24ff18 (diff)
downloadpfsense-3093b9653527806a34bf758b03ee395ec1639692.zip
pfsense-3093b9653527806a34bf758b03ee395ec1639692.tar.gz
Fix for bug 6966 https://redmine.pfsense.org/issues/6966
Change-Id: I9471c2bbd8941e70965a86d369c8de87be9a4417 (cherry picked from commit 109a304e154a179bd340b06880ce95baec4dab03)
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/status_ipsec.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php
index 90dca5e..0e54af2 100644
--- a/src/usr/local/www/status_ipsec.php
+++ b/src/usr/local/www/status_ipsec.php
@@ -126,7 +126,13 @@ function print_ipsec_body() {
$ph1idx = substr($con_id, 0, strrpos(substr($con_id, 0, -1), '00'));
$ipsecconnected[$ph1idx] = $ph1idx;
} else {
- $ipsecconnected[$con_id] = $ph1idx = $con_id;
+ if (!ipsec_ikeid_used($con_id)) {
+ // probably a v2 with split connection then
+ $ph1idx = substr($con_id, 0, strrpos(substr($con_id, 0, -1), '00'));
+ $ipsecconnected[$ph1idx] = $ph1idx;
+ } else {
+ $ipsecconnected[$con_id] = $ph1idx = $con_id;
+ }
}
print("<tr>\n");
OpenPOWER on IntegriCloud