[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 341eb00a821c4254ddd04968beed2e98e5a33aff

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 341eb00a821c4254ddd04968beed2e98e5a33aff

[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  341eb00a821c4254ddd04968beed2e98e5a33aff (commit)
      from  6e8d853c8103da10ee6a4abc804848d57fceeb8b (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 341eb00a821c4254ddd04968beed2e98e5a33aff
Author: Michael Tremer <michael.tremer@ipfire.org>
Date:   Sat May 3 15:10:16 2025 +0200

    fwhosts.cgi: Correctly show IP addresses for WireGuard RW peers
    
    Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

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

Summary of changes:
 html/cgi-bin/fwhosts.cgi | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/fwhosts.cgi b/html/cgi-bin/fwhosts.cgi
index 67a0f863a..e92ef6853 100644
--- a/html/cgi-bin/fwhosts.cgi
+++ b/html/cgi-bin/fwhosts.cgi
@@ -3027,11 +3027,15 @@ sub getipforgroup
 		my $peer = &Wireguard::get_peer_by_name($name);
 
 		if (defined $peer) {
+			my @addresses = ();
+
 			if ($peer->{"TYPE"} eq "host") {
-				return $peer->{"CLIENT_ADDRESS"};
+				push(@addresses, @{ $peer->{"CLIENT_ADDRESS"} });
 			} elsif ($peer->{"TYPE"} eq "net") {
-				return join(", ", @{ $peer->{"REMOTE_SUBNETS"} });
+				push(@addresses, @{ $peer->{"REMOTE_SUBNETS"} });
 			}
+
+			return join(", ", @addresses);
 		}
 	}
 


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