[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 621aac67c6b322e44503ad198a38c897578fa0ea

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 621aac67c6b322e44503ad198a38c897578fa0ea

[Michael Tremer]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  621aac67c6b322e44503ad198a38c897578fa0ea (commit)
      from  f8a8123fee011c4772e1752becebe81f7ea8ee93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 621aac67c6b322e44503ad198a38c897578fa0ea
Author: Adolf Belka <adolf.belka@ipfire.org>
Date:   Tue Jun 9 16:43:22 2026 +0200

    wio.cgi: Change status extraction due to OpenVPN-2.7 change
    
    - 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>
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/wio.cgi | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 html/cgi-bin/wio.cgi

Difference in files:
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 ) {


hooks/post-receive
--
IPFire 2.x development tree