public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>
Subject: [PATCH] wio.cgi: Change status extraction due to OpenVPN-2.7 change
Date: Tue,  9 Jun 2026 13:32:55 +0200	[thread overview]
Message-ID: <20260609113255.90799-1-adolf.belka@ipfire.org> (raw)

- With OpenVPN-2.7 the format of the RW status log changed. This was updated in
   the ovpnmain.cgi file but was missed for the wio.cgi file
- This patch corrects that.

Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
 html/cgi-bin/wio.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 html/cgi-bin/wio.cgi

diff --git a/html/cgi-bin/wio.cgi b/html/cgi-bin/wio.cgi
old mode 100644
new mode 100755
index a3a7b071e..cd2d11848
--- a/html/cgi-bin/wio.cgi
+++ b/html/cgi-bin/wio.cgi
@@ -1364,8 +1364,8 @@ foreach $key (keys %ovpnconfighash) {
 		}
 		else {
 			foreach (@ovpnstatus) {
-				if ( $_ =~ /^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) {
-					@match = split (m/^(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $_);
+				if ( $_ =~ /^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/ ) {
+					@match = split (m/^(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(\d+),(\d+),(.+)/, $_);
 					$match[1] =~ s/[_]/ /g;
 				}
 
@@ -1374,8 +1374,8 @@ foreach $key (keys %ovpnconfighash) {
 					$ovpntime = &WIO::contime($match[5], "ovpn");
 				}
 
-				if ( $_ =~ /^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/ ) {
-					@match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $_);
+				if ( $_ =~ /^(\d+\.\d+\.\d+\.\d+),(.+),('+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/ ) {
+					@match = split(m/^(\d+\.\d+\.\d+\.\d+),(.+),(.+\:\d+\.\d+\.\d+\.\d+\:\d+),(.+)/, $_);
 				}
 
 				if ( $match[1] ne "Virtual Address" && $match[2] eq $ovpnclt ) {
-- 
2.54.0



                 reply	other threads:[~2026-06-09 11:33 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260609113255.90799-1-adolf.belka@ipfire.org \
    --to=adolf.belka@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox