diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-17 14:15:24 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-17 14:15:24 -0300 |
| commit | a57b6d575f3730064a79f175ff772dd766cdb961 (patch) | |
| tree | a0e22a1f39b8c34b62d7985528ac920105625466 /etc/inc/openvpn.inc | |
| parent | f1a44a3a98814171d36584d1cd35e1c444ccc55a (diff) | |
| parent | 15c5b5d63710f28284a974902d0771ceefbb5e86 (diff) | |
| download | pfsense-a57b6d575f3730064a79f175ff772dd766cdb961.zip pfsense-a57b6d575f3730064a79f175ff772dd766cdb961.tar.gz | |
Merge remote branch 'mainline/master' into inc
Diffstat (limited to 'etc/inc/openvpn.inc')
| -rw-r--r-- | etc/inc/openvpn.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 8116f96..ec127b3 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -719,6 +719,7 @@ function openvpn_get_active_servers() { $server = array(); $server['port'] = $settings['local_port']; + $server['mode'] = $settings['mode']; if ($settings['description']) $server['name'] = "{$settings['description']} {$prot}:{$port}"; else @@ -747,7 +748,7 @@ function openvpn_get_active_servers() { continue; /* parse end of output line */ - if (strstr($line, "END")) + if (strstr($line, "END") || strstr($line, "ERROR")) break; /* parse client list line */ @@ -827,7 +828,7 @@ function openvpn_get_active_clients() { $client['remote_host'] = $list[4]; } /* parse end of output line */ - if (strstr($line, "END")) + if (strstr($line, "END") || strstr($line, "ERROR")) break; } |
