From patchwork Tue Jun 9 11:32:55 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9916 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4gZRbz0f7Bz3wbB for ; Tue, 09 Jun 2026 11:33:03 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (Client CN "mail02.haj.ipfire.org", Issuer "E8" (not verified)) by mail01.ipfire.org (Postfix) with ESMTPS id 4gZRby59s3z5cx for ; Tue, 09 Jun 2026 11:33:02 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gZRby4QC3z32Pq for ; Tue, 09 Jun 2026 11:33:02 +0000 (UTC) X-Original-To: development@lists.ipfire.org Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature ECDSA (secp384r1 raw public key) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R12" (not verified)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4gZRbw13lXz2xM3 for ; Tue, 09 Jun 2026 11:33:00 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4gZRbv0vvwzKW; Tue, 09 Jun 2026 11:32:59 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1781004779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=A8oX1N5VhQgsjkDIxmsEb7f8Iz/BDi0MuPW/bb8w85M=; b=uf8oh8cuLD/Q70zRVztasE7oePhJfbpbdAgrb+7pR9KReWIQG5sm/+CWY0RfvIMqzg2W8x 6rOg0BVQo6CxMICw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1781004779; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=A8oX1N5VhQgsjkDIxmsEb7f8Iz/BDi0MuPW/bb8w85M=; b=quIiajHJyeEgErFmcv0z067GVWrpZI0xV8b8l42qL2CL1zq6T1xj3G0x0Qvw6vdvOt51oY o8+X+RnVM7TvmhCUPTC8neYtcvb8Za1TThtUCrzAlnufCIjdxrTHjZ4ObDjF78rzTcaaG0 xxuQWLouZ4FKUgEkcwtId6LSpSExsw/YVxB6qZ+JHLVzoNRHdXEPchpRaBy4WAiiMiAUqH UZ4DAWmYCMTwYkJk3m9iVMdZOHiBT/CyYG64uN2Suh5DseSNP5bBw8g8tzNxTAUqXwXJtc zvZFWe5fpaT4fwOUFP8a0NhmCK8Q6UwTFk2nCnjM7LoXWZAx01ubZUhnVKtWHw== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH] wio.cgi: Change status extraction due to OpenVPN-2.7 change Date: Tue, 9 Jun 2026 13:32:55 +0200 Message-ID: <20260609113255.90799-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 - 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 Signed-off-by: Adolf Belka --- 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 ) {