From patchwork Tue Jun 9 14:43:22 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 9917 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 4gZWqn0Npdz3wbB for ; Tue, 09 Jun 2026 14:43:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [IPv6:2001:678:b28::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 4gZWqm4GXhz4Mm for ; Tue, 09 Jun 2026 14:43:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [IPv6:::1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4gZWqm3S81z2xSM for ; Tue, 09 Jun 2026 14:43:32 +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 4gZWqg6fZmz2xMD for ; Tue, 09 Jun 2026 14:43:27 +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 4gZWqf0Cb8z1Vc; Tue, 09 Jun 2026 14:43:25 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1781016206; 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=P6IUzwX9x1L4BVSe8/r3O/Jrf028hUC9pdWbfu2zhf0=; b=t2eP5t1YuAjnGNyTP969YZuQB4HxJOt7b2CzmvEZDjnIkYNsrza2q/vmFbnIG1K5Pxe+ZR rDkWaZLoakVDQ+Dw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1781016206; 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=P6IUzwX9x1L4BVSe8/r3O/Jrf028hUC9pdWbfu2zhf0=; b=HIvK5s95gCVeA9cu/mZXmlQ4ZQ9T/hL+LPzd277sFD9+vhyOel55j8RNgFpbQzEZAD0xKl q6qxWtWfbSxTtBU81dtO3HKRHTlq/XkSPVqOG1nw2xW5U5NIHBBN1lEmzXV/OGk+bCz6jc +FqS10P9ar71I1Sbqn+TxO/9QuwIF2Bo/czcU0vE1Ceh+y6tJymkqkEqDz2L7oLxjxOPbw iFWnctuljI2Z302s6xYxe0gtlYq193Aj64wQbnrHkCsosbArt3A0+U7pxDe1EVZK2KJIJW oYyppQFGFsbvPp084v780L2UkB6QhVTbpmmGYs91c2lYqAM88BxKMUkJNEW5qg== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka Subject: [PATCH v2] wio.cgi: Change status extraction due to OpenVPN-2.7 change Date: Tue, 9 Jun 2026 16:43:22 +0200 Message-ID: <20260609144322.200673-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..7051e4844 --- 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 ) {