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

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@ipfire.org

On 24 Mar 2020, at 10:29, Erik Kapfer ummeegge@ipfire.org wrote:

Fix #12334

Signed-off-by: Erik Kapfer ummeegge@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