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 4b5WmL3yzhz32fj for ; Mon, 26 May 2025 10:12:50 +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) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4b5WmH0G2Lz2xng for ; Mon, 26 May 2025 10:12:47 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4b5WmD64jSz2SR; Mon, 26 May 2025 10:12:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1748254366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q5dVxVqqsi5YFUr5cQqSNUTzFoVRPcEjwYk06hctrwo=; b=3HoFGdjXejUPB05y74iPjtmqN2Pe3CavjBmmpROYoF+9OG6bW7lICxSfKPiaZTiyJMHRN5 orwsdbWEbSopvNAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1748254366; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=q5dVxVqqsi5YFUr5cQqSNUTzFoVRPcEjwYk06hctrwo=; b=j1CTwnJuTwth1Hs15A/M2Igxlx0Auf/fbtAxmvuthUWwtiX71YfII0m9K2ux6lkFTEnWy5 wDM9qWDAsmM8kGnyCOHuxCyrN0IaM0sNMtH3vgvAfydMxZY7RezSqC+HqFdfZpirmH0Mtw dSZ5XFFTywo1feiEX7hZaQtgDgITRgVgCzYizKgFhTQuezK5mrLFuvB0ZKfv0zFco7Radp bWZ8DPIKKUpA0GyC7iNzCdebrd5OZuDmM7+GGywPFgZf+2BInYKrkURxu+SLJtVulHOedg EXGsIZjmtS2raNqLek2kEDVYf3FLnZyQumah14Z/ssP13wOECXH8dPnJlq8f3A== Content-Type: text/plain; charset=us-ascii Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: Mime-Version: 1.0 Subject: Re: [PATCH] index.cgi: Add wireguard status to home screen From: Michael Tremer In-Reply-To: <20250525113501.9516-1-adolf.belka@ipfire.org> Date: Mon, 26 May 2025 11:12:34 +0100 Cc: development@lists.ipfire.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <20250525113501.9516-1-adolf.belka@ipfire.org> To: Adolf Belka Hello Adolf, Thank you for this patch. I have made some further changes to this, but in essence I agree with = it: = https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3Dc29a07b2ee50= 5811a6cd78ca643bf816beb77375 = https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3D9f1f3da8f586= 6098177edd68ef50b238a3dadf6a = https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3D8277dec16614= df36ed0bd6f687ce244c2d243c62 (not too related) = https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dcommitdiff;h=3Dc00e6e49c3cd= 0ba0fa3826539c251d757f41bc9a Should we also add the N2N connections? -Michael > On 25 May 2025, at 12:35, Adolf Belka wrote: >=20 > - This fix adds a wireguard line to show when it is enabled. > - This fix does not show a table for any net2net connections that are = enabled. I have > started working on that but as I only have an OpenVPN n2n connection = in place, I can't > test out the copy of the ipsec n2n code section that I have made. I = need to get ipsec > and wireguard n2n connections working first. > - If someone else wants to provide a patch for the wireguard n2n = connections tables I have > no problems with that. If not then I will submit one when I have = been able to test it. >=20 > Tested-by: Adolf Belka > Signed-off-by: Adolf Belka > --- > html/cgi-bin/index.cgi | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) >=20 > diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi > index d9c74ce7f..e28629cc9 100644 > --- a/html/cgi-bin/index.cgi > +++ b/html/cgi-bin/index.cgi > @@ -2,7 +2,7 @@ > = ##########################################################################= ##### > # = # > # IPFire.org - A linux based firewall = # > -# Copyright (C) 2007-2023 IPFire Team = # > +# Copyright (C) 2007-2025 IPFire Team = # > # = # > # This program is free software: you can redistribute it and/or modify = # > # it under the terms of the GNU General Public License as published by = # > @@ -39,6 +39,7 @@ my %netsettings=3D(); > my %ddnssettings=3D(); > my %proxysettings=3D(); > my %vpnsettings=3D(); > +my %wgsettings=3D(); > my %vpnconfig=3D(); > my %ovpnconfig=3D(); > my $warnmessage =3D ''; > @@ -60,6 +61,7 @@ $pppsettings{'PROFILENAME'} =3D 'None'; > &General::readhash("${General::swroot}/ddns/settings", = \%ddnssettings); > &General::readhash("${General::swroot}/proxy/advanced/settings", = \%proxysettings); > &General::readhash("${General::swroot}/vpn/settings", \%vpnsettings); > +&General::readhash("${General::swroot}/wireguard/settings", = \%wgsettings); >=20 > my %color =3D (); > my %mainsettings =3D (); > @@ -369,7 +371,21 @@ print < Online > > END > - } > +} > + > +#check if WireGuard is running > +if ( $wgsettings{'ENABLED'} eq 'on' ) { > +print< + > + > + $Lang::tr{'wg'} > + > + > + Online > + > +END > +} > + > print""; > &Header::closesection(); >=20 > --=20 > 2.49.0 >=20 >=20