From mboxrd@z Thu Jan  1 00:00:00 1970
From: Erik Kapfer <erik.kapfer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH v2] OpenVPN: Calculate CIDR to DDN notation for RW
Date: Wed, 05 Dec 2018 08:14:03 +0100
Message-ID: <20181205071403.22330-1-erik.kapfer@ipfire.org>
In-Reply-To: <20181204073402.27898-1-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============8984022558593317319=="
List-Id: <development.lists.ipfire.org>

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

Fixes #11823

Patches enables CIDR and dotted-decimal notation for "OpenVPN subnet:" entrie=
s in "Global settings".
network-functions.pl has been introduced.

Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
 html/cgi-bin/ovpnmain.cgi | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 976300fc7..6e57a4991 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -32,6 +32,7 @@ use strict;
 use Archive::Zip qw(:ERROR_CODES :CONSTANTS);
 use Sort::Naturally;
 require '/var/ipfire/general-functions.pl';
+require '/var/ipfire/network-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
 require "${General::swroot}/countries.pl";
@@ -245,6 +246,7 @@ sub pkiconfigcheck
 sub writeserverconf {
     my %sovpnsettings =3D (); =20
     my @temp =3D (); =20
+    my @tempovpnsubnet =3D ();
     &General::readhash("${General::swroot}/ovpn/settings", \%sovpnsettings);
     &read_routepushfile;
    =20
@@ -267,8 +269,16 @@ sub writeserverconf {
     print CONF "cert ${General::swroot}/ovpn/certs/servercert.pem\n";
     print CONF "key ${General::swroot}/ovpn/certs/serverkey.pem\n";
     print CONF "dh ${General::swroot}/ovpn/ca/$cgiparams{'DH_NAME'}\n";
-    my @tempovpnsubnet =3D split("\/",$sovpnsettings{'DOVPN_SUBNET'});
-    print CONF "server $tempovpnsubnet[0] $tempovpnsubnet[1]\n";
+    # ovpn subnet calculate prefix to netmask if needed
+    if ($sovpnsettings{'DOVPN_SUBNET'} ne '') {
+        my ($ip,$subnet) =3D split(/\//,"$vpnsettings{'DOVPN_SUBNET'}");
+        if (&Network::check_prefix($subnet)) {
+            $subnet =3D &Network::convert_prefix2netmask($subnet);
+            print CONF "server $ip $subnet\n";
+        } else {
+            print CONF "server $ip $subnet\n";
+        }
+    }
     #print CONF "push \"route $netsettings{'GREEN_NETADDRESS'} $netsettings{=
'GREEN_NETMASK'}\"\n";
=20
     # Check if we are using mssfix, fragment and set the corretct mtu of 150=
0.
--=20
2.12.2


--===============8984022558593317319==--