diff options
| author | Ermal <eri@pfsense.org> | 2014-09-10 22:22:52 +0200 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2014-09-10 22:39:30 +0200 |
| commit | 7ab6ad705edc1f539f098fa41d74c9336ac497fa (patch) | |
| tree | 6c3bcd57da4f75b9c2a228bc24419de8012867ca | |
| parent | 9060f420a9444c68fc8db926787d0bb37d77ed72 (diff) | |
| download | pfsense-7ab6ad705edc1f539f098fa41d74c9336ac497fa.zip pfsense-7ab6ad705edc1f539f098fa41d74c9336ac497fa.tar.gz | |
Make use of the xml output from stroke leases command
| -rw-r--r-- | etc/inc/ipsec.inc | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/etc/inc/ipsec.inc b/etc/inc/ipsec.inc index 9b8781c..e03259b 100644 --- a/etc/inc/ipsec.inc +++ b/etc/inc/ipsec.inc @@ -601,35 +601,21 @@ function ipsec_dump_sad() * Return dump of mobile user list */ function ipsec_dump_mobile() { - /* XXX: Need to be fixed */ - return array(); + global $g; - $command = "/usr/local/sbin/racoonctl show-users"; - $fd = @popen($command, "r"); - $mobile = array(); - if ($fd) { - while (!feof($fd)) { - $user = array(); - $line = chop(fgets($fd)); - if (!$line) - continue; - if ($line == "User|Source|Destination|CreatedOn|SPI") - continue; + $_gb = exec("/usr/local/sbin/ipsec stroke leases > {$g['tmp_path']}/strongswan_leases.xml"); - // jim|192.168.20.243:4500|192.168.20.5:24146|2012-05-25 09:54:39|989d10e1e2d4eca4:7243830d5fd2afe7 - $linea = explode("|", trim($line)); - $user['username'] = $linea[0]; - $user['local'] = $linea[1]; - $user['remote'] = $linea[2]; - $user['logintime'] = $linea[3]; - $user['spi'] = $linea[4]; - if (!empty($user['username'])) - $mobile[] = $user; - } - pclose($fd); + if (!file_exists("{$g['varrun_path']}/strongswan_leases.xml")) { + log_error(gettext("IPSec daemon seems to have issues or not running! Could not display mobile user stats!")); + return array(); } - return $mobile; + $custom_listtags = array('lease', 'pool'); + $response = parse_xml_config("{$g['tmp_path']}/strongswan_leases.xml", "leases"); + @unlink("{$g['tmp_path']}/strongswan_leases.xml"); + unset($custom_listtags, $_gb); + + return $response; } function ipsec_mobilekey_sort() { |
