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 [thread overview]
Message-ID: <3f6a245c45f969a96c794a8999c9f1869124fa26.camel@ipfire.org> (raw)
In-Reply-To: <9E30F9DE-DABE-4AFF-B4A5-6A492421A265@ipfire.org>
[-- 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
> > > >
> > >
> > >
>
>
next prev parent reply other threads:[~2020-03-25 12:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-24 10:29 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 [this message]
2020-03-25 17:48 ` ummeegge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3f6a245c45f969a96c794a8999c9f1869124fa26.camel@ipfire.org \
--to=ummeegge@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox