diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-09-02 14:57:49 -0300 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-09-02 14:57:49 -0300 |
commit | 55d6f48bc8f5b24f0756e52a121b26c2a57fe186 (patch) | |
tree | 967cbf21e2644df6c9758dd117a62d36a6df949b /usr/local/www/diag_ipsec.php | |
parent | dfae7a8b39d0b6d25d107d4449477d29c7a73711 (diff) | |
download | pfsense-55d6f48bc8f5b24f0756e52a121b26c2a57fe186.zip pfsense-55d6f48bc8f5b24f0756e52a121b26c2a57fe186.tar.gz |
id changes every time ipsec tunnel disconnects and reconnect, need to use peerconfig to get correct description. Ticket #3826
Diffstat (limited to 'usr/local/www/diag_ipsec.php')
-rw-r--r-- | usr/local/www/diag_ipsec.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 33b0c85..8667fb9 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -114,6 +114,8 @@ $status = ipsec_smp_dump_status(); <?php if (is_array($status['query']) && is_array($status['query']['ikesalist']) && is_array($status['query']['ikesalist']['ikesa'])) { foreach ($status['query']['ikesalist']['ikesa'] as $ikeid => $ikesa) { + $con_id = substr($ikesa['peerconfig'], 3); + if (ipsec_phase1_status($status['query']['ikesalist']['ikesa'], $ikesa['id'])) { $icon = "pass"; } elseif(!isset($config['ipsec']['enable'])) { @@ -124,7 +126,7 @@ $status = ipsec_smp_dump_status(); ?> <tr> <td class="listlr"> - <?php echo "({$ikesa['id']}) " . htmlspecialchars(ipsec_get_descr($ikesa['id']));?> + <?php echo htmlspecialchars(ipsec_get_descr($con_id));?> </td> <td class="listr"> <?php if (!is_array($ikesa['local'])) @@ -186,13 +188,13 @@ $status = ipsec_smp_dump_status(); <td > <?php if ($icon != "pass"): ?> <center> - <a href="diag_ipsec.php?act=connect&ikeid=<?php echo $ikesa['id']; ?>"> + <a href="diag_ipsec.php?act=connect&ikeid=<?php echo $con_id; ?>"> <img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_service_start.gif" alt="Connect VPN" title="Connect VPN" border="0"/> </a> </center> <?php else: ?> <center> - <a href="diag_ipsec.php?act=ikedisconnect&ikeid=<?php echo $ikesa['id']; ?>"> + <a href="diag_ipsec.php?act=ikedisconnect&ikeid=<?php echo $con_id; ?>"> <img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_service_stop.gif" alt="Disconnect VPN" title="Disconnect VPN" border="0"/> </a> </center> @@ -263,6 +265,8 @@ $status = ipsec_smp_dump_status(); </td> </tr> <?php endif; + + unset($con_id); } } ?> |