From: Stefan Schantl <stefan.schantl@ipfire.org>
Date: Sun, 18 Jul 2021 09:29:46 +0000 (+0200)
Subject: ovpnmain.cgi: Use new convert_to_cidr_or_mask() function.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=beb7386054d321c560c4917f5f32f8c70293d5e2;p=people%2Fstevee%2Fipfire-2.x.git

ovpnmain.cgi: Use new convert_to_cidr_or_mask() function.

Signed-off-by: Stefan Schantl <stefan.schantl@ipfire.org>
---

diff --git a/html/cgi-bin/ovpnmain.cgi b/html/cgi-bin/ovpnmain.cgi
index 7a2833ce61..73b04c33a3 100644
--- a/html/cgi-bin/ovpnmain.cgi
+++ b/html/cgi-bin/ovpnmain.cgi
@@ -298,7 +298,7 @@ sub writeserverconf {
 		@temp = split(/\n/,$vpnsettings{'ROUTES_PUSH'});
 		foreach (@temp)
 		{
-			@tempovpnsubnet = split("\/",&General::ipcidr2msk($_));
+			@tempovpnsubnet = split("\/",&Network::convert_to_cidr_or_mask($_, "mask"));
 			print CONF "push \"route " . $tempovpnsubnet[0]. " " .  $tempovpnsubnet[1] . "\"\n";
 		}
 	}
@@ -864,7 +864,7 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'save-adv-options'}) {
 				$errormessage = "$tmpip ".$Lang::tr{'ovpn errmsg invalid ip or mask'};
 				goto ADV_ERROR;
 			}
-			my ($ip, $cidr) = split("\/",&General::ipcidr2msk($tmpip));
+			my ($ip, $cidr) = split("\/",&Network::convert_to_cidr_or_mask($tmpip, "mask"));
 			
 			if ($ip eq $netsettings{'GREEN_NETADDRESS'} && $cidr eq $netsettings{'GREEN_NETMASK'}) {
 				$errormessage = $Lang::tr{'ovpn errmsg green already pushed'};