From beb7386054d321c560c4917f5f32f8c70293d5e2 Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 18 Jul 2021 11:29:46 +0200 Subject: [PATCH] ovpnmain.cgi: Use new convert_to_cidr_or_mask() function. Signed-off-by: Stefan Schantl --- html/cgi-bin/ovpnmain.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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'}; -- 2.39.5