From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZqSpJ5cFlz30Ry for ; Sat, 3 May 2025 13:10:48 +0000 (UTC) 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) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZqSpJ5KPmz30N0 for ; Sat, 3 May 2025 13:10:48 +0000 (UTC) Received: from people01.haj.ipfire.org (people01.haj.ipfire.org [172.28.1.161]) (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 client-signature ECDSA (secp384r1) client-digest SHA384) (Client CN "people01.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4ZqSpH2Szgz1Vr for ; Sat, 3 May 2025 13:10:47 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1746277847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=aSOAn4k/lS26aGHJor0+nMgTqGlEufAdKpWvNVaNE+s=; b=sluxslFBS/uQyQ/6sM9gBPC4tsJyuIZBp2PABp6hq9DU6wfak1JpMO+Y/jQVxgNb5MvpH/ oa4b12l1M7uKeODQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1746277847; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc; bh=aSOAn4k/lS26aGHJor0+nMgTqGlEufAdKpWvNVaNE+s=; b=G7BHZOjSMH0MzUUzbHcUWSQ7zPD//ldxPH8kMIBkYMueuOavmCnWEsNkWlQG80aQfEtV0S KX/XoE4DrvE5GKcQ3V+X2odY+CEr/63QfWX+TTfSO+Q3pBLgrcClu1tqp7mPY/qgNBvjMt p3di84W6pzEBmJ4vy4oWd5Gh76OEQUyUsEtrvgS7vhSKp21neziNfMxNB7iBOtpqPN6mxA OZXiEAxIoIGlWYEdpV1Bqa4atkf89WKHm0Xfxc3LQhf8kMm+C6zKRn9ScDc/W8xbWjBSbp EP1n/eTeGIDGPsKqcn+GAVD3+WsxfE3FdtB0oTp6hOX1WAAIC6Wr++KdiRzj5g== Received: by people01.haj.ipfire.org (Postfix, from userid 1000) id 4ZqSpG6xZNz2y8r; Sat, 3 May 2025 13:10:46 +0000 (UTC) To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 341eb00a821c4254ddd04968beed2e98e5a33aff X-Git-Refname: refs/heads/next X-Git-Reftype: branch X-Git-Oldrev: 6e8d853c8103da10ee6a4abc804848d57fceeb8b X-Git-Newrev: 341eb00a821c4254ddd04968beed2e98e5a33aff Message-Id: <4ZqSpG6xZNz2y8r@people01.haj.ipfire.org> Date: Sat, 3 May 2025 13:10:46 +0000 (UTC) From: Michael Tremer Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: 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 Date: Sat May 3 15:10:16 2025 +0200 fwhosts.cgi: Correctly show IP addresses for WireGuard RW peers Signed-off-by: Michael Tremer ----------------------------------------------------------------------- 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