diff options
author | jim-p <jimp@pfsense.org> | 2017-01-01 11:03:41 -0500 |
---|---|---|
committer | jim-p <jimp@pfsense.org> | 2017-01-01 11:03:41 -0500 |
commit | 6f17547aaa073ca460c8bbd8dc1dc5c12922b76d (patch) | |
tree | 8d56226bc22176a25c7bee2c1f871d51a391b9f1 /src | |
parent | 56110c7249b5dbd9ea4e0b4c4009794c69a58143 (diff) | |
download | pfsense-6f17547aaa073ca460c8bbd8dc1dc5c12922b76d.zip pfsense-6f17547aaa073ca460c8bbd8dc1dc5c12922b76d.tar.gz |
Update OpenVPN SSL/TLS server status to reflect changes in OpenVPN 2.4. Ticket #2766
Diffstat (limited to 'src')
-rw-r--r-- | src/etc/inc/openvpn.inc | 11 | ||||
-rw-r--r-- | src/usr/local/www/status_openvpn.php | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/src/etc/inc/openvpn.inc b/src/etc/inc/openvpn.inc index d370e90..d48e6f6 100644 --- a/src/etc/inc/openvpn.inc +++ b/src/etc/inc/openvpn.inc @@ -1446,9 +1446,14 @@ function openvpn_get_server_status($server, $socket) { $conn['common_name'] = $list[1]; $conn['remote_host'] = $list[2]; $conn['virtual_addr'] = $list[3]; - $conn['bytes_recv'] = $list[4]; - $conn['bytes_sent'] = $list[5]; - $conn['connect_time'] = $list[6]; + $conn['virtual_addr6'] = $list[4]; + $conn['bytes_recv'] = $list[5]; + $conn['bytes_sent'] = $list[6]; + $conn['connect_time'] = $list[7]; + $conn['connect_time_unix'] = $list[8]; + $conn['user_name'] = $list[9]; + $conn['client_id'] = $list[10]; + $conn['peer_id'] = $list[11]; $server['conns'][] = $conn; } /* parse routing table lines */ diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index c643b20..1722db6 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -102,7 +102,8 @@ include("head.inc"); ?> <tr> <th><?=gettext("Common Name")?></th> <th><?=gettext("Real Address")?></th> - <th><?=gettext("Virtual Address"); ?></th> + <th><?=gettext("Virtual IPv4 Address"); ?></th> + <th><?=gettext("Virtual IPv6 Address"); ?></th> <th><?=gettext("Connected Since"); ?></th> <th><?=gettext("Bytes Sent")?></th> <th><?=gettext("Bytes Received")?></th> @@ -118,6 +119,7 @@ include("head.inc"); ?> <td><?=$conn['common_name'];?></td> <td><?=$conn['remote_host'];?></td> <td><?=$conn['virtual_addr'];?></td> + <td><?=$conn['virtual_addr6'];?></td> <td><?=$conn['connect_time'];?></td> <td><?=format_bytes($conn['bytes_sent']);?></td> <td><?=format_bytes($conn['bytes_recv']);?></td> |