* [PATCH] OpenVPN: Stop N2N connection before remove. @ 2020-03-24 10:29 Erik Kapfer 2020-03-24 11:31 ` Michael Tremer 0 siblings, 1 reply; 6+ messages in thread From: Erik Kapfer @ 2020-03-24 10:29 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 893 bytes --] 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OpenVPN: Stop N2N connection before remove. 2020-03-24 10:29 [PATCH] OpenVPN: Stop N2N connection before remove Erik Kapfer @ 2020-03-24 11:31 ` Michael Tremer 2020-03-24 12:31 ` ummeegge 0 siblings, 1 reply; 6+ messages in thread From: Michael Tremer @ 2020-03-24 11:31 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 1214 bytes --] Hello, Brilliant fix. Thanks for looking into this so quickly. Did you check if we have any other issues like this? 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 > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OpenVPN: Stop N2N connection before remove. 2020-03-24 11:31 ` Michael Tremer @ 2020-03-24 12:31 ` ummeegge 2020-03-24 14:42 ` Michael Tremer 0 siblings, 1 reply; 6+ messages in thread From: ummeegge @ 2020-03-24 12:31 UTC (permalink / raw) To: development [-- 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 > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OpenVPN: Stop N2N connection before remove. 2020-03-24 12:31 ` ummeegge @ 2020-03-24 14:42 ` Michael Tremer 2020-03-25 12:09 ` ummeegge 0 siblings, 1 reply; 6+ messages in thread From: Michael Tremer @ 2020-03-24 14:42 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 1867 bytes --] Yes, please. If we spot a bug, we should of course fix it :) > On 24 Mar 2020, at 12:31, ummeegge <ummeegge(a)ipfire.org> wrote: > > 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 >>> >> >> > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OpenVPN: Stop N2N connection before remove. 2020-03-24 14:42 ` Michael Tremer @ 2020-03-25 12:09 ` ummeegge 2020-03-25 17:48 ` ummeegge 0 siblings, 1 reply; 6+ messages in thread From: ummeegge @ 2020-03-25 12:09 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2306 bytes --] 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 > > > On 24 Mar 2020, at 12:31, ummeegge <ummeegge(a)ipfire.org> wrote: > > > > 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{'K > > > > EY'} > > > > }[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); > > > > my $certfile = > > > > glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'KEY > > > > '}}[ > > > > 1].p12"); > > > > -- > > > > 2.12.2 > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OpenVPN: Stop N2N connection before remove. 2020-03-25 12:09 ` ummeegge @ 2020-03-25 17:48 ` ummeegge 0 siblings, 0 replies; 6+ messages in thread From: ummeegge @ 2020-03-25 17:48 UTC (permalink / raw) To: development [-- Attachment #1: Type: text/plain, Size: 2778 bytes --] Have had a double look into this one specific and it should be left as it is since it works and the other solution will breaks it. But have found some more. Need a little more time. Best, Erik Am Mittwoch, den 25.03.2020, 13:09 +0100 schrieb ummeegge: > 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 > > > > > > On 24 Mar 2020, at 12:31, ummeegge <ummeegge(a)ipfire.org> wrote: > > > > > > 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{ > > > > > 'K > > > > > EY'} > > > > > }[1]/$confighash{$cgiparams{'KEY'}}[1].conf"); > > > > > my $certfile = > > > > > glob("${General::swroot}/ovpn/certs/$confighash{$cgiparams{'K > > > > > EY > > > > > '}}[ > > > > > 1].p12"); > > > > > -- > > > > > 2.12.2 > > > > > > > > > > > > > > > > > > > ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-03-25 17:48 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-03-24 10:29 [PATCH] OpenVPN: Stop N2N connection before remove Erik Kapfer 2020-03-24 11:31 ` Michael Tremer 2020-03-24 12:31 ` ummeegge 2020-03-24 14:42 ` Michael Tremer 2020-03-25 12:09 ` ummeegge 2020-03-25 17:48 ` ummeegge
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox