diff options
| author | Ermal <eri@pfsense.org> | 2014-09-10 19:23:20 +0200 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-09-10 19:23:20 +0200 |
| commit | e952906e1238fd00f488eea82b692ec0a98138ac (patch) | |
| tree | c101908ae6b5fe19cef867df4eccc5479a2aa8ec /usr | |
| parent | 3b977eff751648d85a34ccfff1612daf813e3e4c (diff) | |
| download | pfsense-e952906e1238fd00f488eea82b692ec0a98138ac.zip pfsense-e952906e1238fd00f488eea82b692ec0a98138ac.tar.gz | |
Remove traces of older implementation still present
Diffstat (limited to 'usr')
| -rw-r--r-- | usr/local/www/diag_ipsec.php | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 76b3089..1317e51 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -59,13 +59,15 @@ if ($_GET['act'] == 'connect') { } } else if ($_GET['act'] == 'ikedisconnect') { if (ctype_digit($_GET['ikeid'])) { - mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid'])); + if (!empty($_GET['ikesaid']) && ctype_digit($_GET['ikesaid'])) + mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "[" . escapeshellarg($_GET['ikesaid']) . "]"); + else + mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid'])); } -} else if ($_GET['act'] == 'disconnect') { - if (!empty($_GET['user'])) { - ipsec_disconnect_mobile($_GET['user']); - sleep(1); - $savemsg = gettext("Disconnected user") . " " . $_GET['user']; +} else if ($_GET['act'] == 'childdisconnect') { + if (ctype_digit($_GET['ikeid'])) { + if (!empty($_GET['ikesaid']) && ctype_digit($_GET['ikesaid'])) + mwexec("/usr/local/sbin/ipsec down con" . escapeshellarg($_GET['ikeid']) . "{" . escapeshellarg($_GET['ikesaid']) . "}"); } } @@ -213,6 +215,9 @@ $status = ipsec_smp_dump_status(); <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> + <a href="diag_ipsec.php?act=ikedisconnect&ikeid=<?php echo $con_id; ?>&ikesaid=<?php echo $ikesa['id']; ?>"> + <img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" alt="Disconnect VPN Connection" title="Disconnect VPN Connection" border="0"/> + </a> </center> <?php endif; ?> </td> @@ -295,6 +300,13 @@ $status = ipsec_smp_dump_status(); echo "Bytes-Out: " . htmlspecialchars($childsa['bytesout']) . "/Packets-Out: " . htmlspecialchars($childsa['packetsout']);; ?> </td> + <td class="listr nowrap"> + <center> + <a href="diag_ipsec.php?act=childdisconnect&ikeid=<?php echo $con_id; ?>&ikesaid=<?php echo $childsa['reqid']; ?>"> + <img src ="/themes/<?php echo $g['theme']; ?>/images/icons/icon_x.gif" alt="Disconnect Child SA" title="Disconnect Child SA" border="0"/> + </a> + </center> + </td> <td class="list nowrap"> </td> |
