From mboxrd@z Thu Jan  1 00:00:00 1970
From: ummeegge <erik.kapfer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] OpenVPN: Add start of static routes in client N2N
Date: Wed, 11 Nov 2020 18:12:25 +0000
Message-ID: <20201111181225.26237-1-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1897445787180859364=="
List-Id: <development.lists.ipfire.org>

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

Fixes: #12529

- If a client N2N configuration will be imported into IPFire systems,
a line will be added which calls the --up script to restart the
static route initscript. Since this is IPFire specific, i will only be
added via import on IPFire system.
- Deleted unneeded line in CLIENTCONF section.
- Added description to SERVERCONF section.

Signed-off-by: ummeegge <erik.kapfer(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 8626a94ca..44cb48996 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -953,6 +953,7 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'NA=
ME'}"){mkdir "${General
   print SERVERCONF "ifconfig $ovsubnet.1 $ovsubnet.2\n";=20
   print SERVERCONF "# Client Gateway Network\n";=20
   print SERVERCONF "route $remsubnet[0] $remsubnet[1]\n";
+  print SERVERCONF "# Call up script for static routes\n";
   print SERVERCONF "up \"/etc/init.d/static-routes start\"\n";
   print SERVERCONF "# tun Device\n";=20
   print SERVERCONF "dev tun\n";=20
@@ -1052,7 +1053,6 @@ unless(-d "${General::swroot}/ovpn/n2nconf/$cgiparams{'=
NAME'}"){mkdir "${General
   print CLIENTCONF "ifconfig $ovsubnet.2 $ovsubnet.1\n";=20
   print CLIENTCONF "# Server Gateway Network\n";=20
   print CLIENTCONF "route $remsubnet[0] $remsubnet[1]\n";=20
-  print CLIENTCONF "up \"/etc/init.d/static-routes start\"\n";
   print CLIENTCONF "# tun Device\n";=20
   print CLIENTCONF "dev tun\n";=20
   print CLIENTCONF "#Logfile for statistics\n";
@@ -3333,6 +3333,12 @@ END
 	print FILE "status /var/run/openvpn/$n2nname[0]-n2n 10\n";
 	close FILE;
=20
+	# Add static route command to client configuration
+	open(FILE, ">> $tempdir/$uplconffilename") or die 'Unable to open config fi=
le.';
+	print FILE "# Call up script for static routes\n";
+	print FILE "up \"/etc/init.d/static-routes start\"\n";
+	close FILE;
+
 	move("$tempdir/$uplconffilename", "${General::swroot}/ovpn/n2nconf/$n2nname=
[0]/$uplconffilename2");
=20
 	if ($? ne 0) {
--=20
2.20.1


--===============1897445787180859364==--