From mboxrd@z Thu Jan  1 00:00:00 1970
From: ummeegge <ummeegge@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] OpenVPN: Stop N2N connection before remove.
Date: Wed, 25 Mar 2020 13:09:03 +0100
Message-ID: <3f6a245c45f969a96c794a8999c9f1869124fa26.camel@ipfire.org>
In-Reply-To: <9E30F9DE-DABE-4AFF-B4A5-6A492421A265@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8971077805924585625=="
List-Id: <development.lists.ipfire.org>

--===============8971077805924585625==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Am Dienstag, den 24.03.2020, 14:42 +0000 schrieb Michael Tremer:
> Yes, please. If we spot a bug, we should of course fix it :)
OK, will send another patch for this. May at the evening.

Best,

Erik

>=20
> > On 24 Mar 2020, at 12:31, ummeegge <ummeegge(a)ipfire.org> wrote:
> >=20
> > Hi Michael,
> >=20
> > Am Dienstag, den 24.03.2020, 11:31 +0000 schrieb Michael Tremer:
> > > Hello,
> > >=20
> > > Brilliant fix. Thanks for looking into this so quickly.
> >=20
> > your welcome.
> >=20
> > >=20
> > > Did you check if we have any other issues like this?
> >=20
> > Not similar to that one as far as i can see.
> > This one -->
> >=20
https://git.ipfire.org/?p=3Dipfire-2.x.git;a=3Dblob;f=3Dhtml/cgi-bin/ovpnmain=
.cgi;hb=3D91457877199d3ac8438efc7be4cd6a50e48e37e4#l1221
> > comes closer but it works.
> > Should i nevertheless ?
> >=20
> > Best,
> >=20
> > Erik
> >=20
> > >=20
> > > Best,
> > > -Michael
> > >=20
> > > Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> > >=20
> > > > On 24 Mar 2020, at 10:29, Erik Kapfer <ummeegge(a)ipfire.org>
> > > > wrote:
> > > >=20
> > > > Fix #12334
> > > >=20
> > > > Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> > > > ---
> > > > html/cgi-bin/ovpnmain.cgi | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >=20
> > > > diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-
> > > > bin/ovpnmain.cgi
> > > > index e76a688fe..a6fdd6d75 100644
> > > > --- a/html/cgi-bin/ovpnmain.cgi
> > > > +++ b/html/cgi-bin/ovpnmain.cgi
> > > > @@ -2464,7 +2464,7 @@ else
> > > >=20
> > > > 		if ($confighash{$cgiparams{'KEY'}}[3] eq 'net')
> > > > {
> > > > 			# Stop the N2N connection before it is
> > > > removed
> > > > -			system("/usr/local/bin/openvpnctrl
> > > > -kn2n
> > > > $confighash{$cgiparams{'KEY'}}[1] &>/dev/null");
> > > > +			system('/usr/local/bin/openvpnctrl', '-
> > > > kn2n',
> > > > $confighash{$cgiparams{'KEY'}}[1]);
> > > >=20
> > > > 			my $conffile =3D
> > > > glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'K
> > > > EY'}
> > > > }[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
> > > > 			my $certfile =3D
> > > > glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY
> > > > '}}[
> > > > 1].p12");
> > > > --=20
> > > > 2.12.2
> > > >=20
> > >=20
> > >=20
>=20
>=20


--===============8971077805924585625==--