Re: [PATCH] OpenVPN: Stop N2N connection before remove.

[ummeegge <ummeegge@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 1683 bytes --]

Hi Michael,

Am Dienstag, den 24.03.2020, 11:31 +0000 schrieb Michael Tremer:
> Hello,
> 
> Brilliant fix. Thanks for looking into this so quickly.
your welcome.

> 
> Did you check if we have any other issues like this?
Not similar to that one as far as i can see.
This one -->
https://git.ipfire.org/?p=ipfire-2.x.git;a=blob;f=html/cgi-bin/ovpnmain.cgi;hb=91457877199d3ac8438efc7be4cd6a50e48e37e4#l1221
comes closer but it works.
Should i nevertheless ?

Best,

Erik

> 
> Best,
> -Michael
> 
> Reviewed-by: Michael Tremer <michael.tremer(a)ipfire.org>
> 
> > On 24 Mar 2020, at 10:29, Erik Kapfer <ummeegge(a)ipfire.org> wrote:
> > 
> > Fix #12334
> > 
> > Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
> > ---
> > html/cgi-bin/ovpnmain.cgi | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > 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
> > 
> > 		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]);
> > 
> > 			my $conffile =
> > glob("${General::swroot}/ovpn/n2nconf/$confighash{$cgiparams{'KEY'}
> > }[1]/$confighash{$cgiparams{'KEY'}}[1].conf");
> > 			my $certfile =
> > glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY'}}[
> > 1].p12");
> > -- 
> > 2.12.2
> > 
> 
>