From e8846eaf0cf4d214caeeecb902ce1b13897c7b9e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Tue, 13 Mar 2018 14:58:40 +0100 Subject: [PATCH] openvpn, show last timestamp in openvpn_get_client_status, for https://github.com/opnsense/core/issues/2243 --- src/etc/inc/plugins.inc.d/openvpn.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/openvpn.inc b/src/etc/inc/plugins.inc.d/openvpn.inc index f5a298bb3..09c9781a9 100644 --- a/src/etc/inc/plugins.inc.d/openvpn.inc +++ b/src/etc/inc/plugins.inc.d/openvpn.inc @@ -1367,20 +1367,20 @@ function openvpn_get_client_status($client, $socket) /* Get the client state */ $list = explode(",", $line); + if (count($list) > 1) { + $client['connect_time'] = date('Y-m-d H:i:s', $list[0]); + } if (strstr($line, "CONNECTED")) { $client['status']="up"; - $client['connect_time'] = date('Y-m-d H:i:s', $list[0]); $client['virtual_addr'] = $list[3]; $client['remote_host'] = $list[4]; } elseif (strstr($line, "CONNECTING")) { $client['status']="connecting"; } elseif (strstr($line, "ASSIGN_IP")) { - $client['status']="waiting"; - $client['connect_time'] = date('Y-m-d H:i:s', $list[0]); + $client['status'] = "waiting"; $client['virtual_addr'] = $list[3]; } elseif (strstr($line, "RECONNECTING")) { - $client['status']="reconnecting"; - $client['connect_time'] = date('Y-m-d H:i:s', $list[0]); + $client['status'] = "reconnecting"; $client['status'] .= "; " . $list[2]; } elseif (strstr($line, "END") || strstr($line, "ERROR")) { /* parse end of output line */