diff options
author | jim-p <jimp@pfsense.org> | 2013-04-01 12:15:26 -0400 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2013-04-01 12:57:50 -0400 |
commit | 2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f (patch) | |
tree | 0bc2867a573140e2af05c1e1cc805370f6833be3 /etc/inc/openvpn.inc | |
parent | 9d7204aa2468fbe829a626355bf292740cdf6ad7 (diff) | |
download | pfsense-2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f.zip pfsense-2eaa97b952ebcf9fea18b1168ef94ff9587a5e7f.tar.gz |
Clarify notes when there is an error reaching the openvpn management daemon for service status. Also, add service controls to the openvpn status page.
Diffstat (limited to 'etc/inc/openvpn.inc')
-rw-r--r-- | etc/inc/openvpn.inc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 18267d5..43d55c7 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -958,11 +958,9 @@ function openvpn_get_active_servers($type="multipoint") { else $server['name'] = "Server {$prot}:{$port}"; $server['conns'] = array(); - - $vpnid = $settings['vpnid']; - $mode_id = "server{$vpnid}"; - $server['mgmt'] = $mode_id; - $socket = "unix://{$g['varetc_path']}/openvpn/{$mode_id}.sock"; + $server['vpnid'] = $settings['vpnid']; + $server['mgmt'] = "server{$server['vpnid']}"; + $socket = "unix://{$g['varetc_path']}/openvpn/{$server['mgmt']}.sock"; list($tn, $sm) = explode('/', $settings['tunnel_network']); if ((($server['mode'] == "p2p_shared_key") || ($sm >= 30) ) && ($type == "p2p")) @@ -1032,8 +1030,8 @@ function openvpn_get_server_status($server, $socket) { } else { $conn = array(); $conn['common_name'] = "[error]"; - $conn['remote_host'] = "Management Daemon Unreachable"; - $conn['virtual_addr'] = ""; + $conn['remote_host'] = "Unable to contact daemon"; + $conn['virtual_addr'] = "Service not running?"; $conn['bytes_recv'] = 0; $conn['bytes_sent'] = 0; $conn['connect_time'] = 0; @@ -1062,10 +1060,9 @@ function openvpn_get_active_clients() { else $client['name'] = "Client {$prot}{$port}"; - $vpnid = $settings['vpnid']; - $mode_id = "client{$vpnid}"; - $client['mgmt'] = $mode_id; - $socket = "unix://{$g['varetc_path']}/openvpn/{$mode_id}.sock"; + $client['vpnid'] = $settings['vpnid']; + $client['mgmt'] = "client{$client['vpnid']}"; + $socket = "unix://{$g['varetc_path']}/openvpn/{$client['mgmt']}.sock"; $client['status']="down"; $clients[] = openvpn_get_client_status($client, $socket); @@ -1155,8 +1152,8 @@ function openvpn_get_client_status($client, $socket) { } else { $DisplayNote=true; - $client['remote_host'] = "No Management Daemon"; - $client['virtual_addr'] = "See Note Below"; + $client['remote_host'] = "Unable to contact daemon"; + $client['virtual_addr'] = "Service not running?"; $client['bytes_recv'] = 0; $client['bytes_sent'] = 0; $client['connect_time'] = 0; |