From d2f6190de99834602249e89dccc59056ec28525e Mon Sep 17 00:00:00 2001 From: Stefan Schantl Date: Sun, 18 Jul 2021 11:30:25 +0200 Subject: [PATCH] proxy.cgi: Use new convert_to_cidr_or_mask() function. Signed-off-by: Stefan Schantl --- html/cgi-bin/proxy.cgi | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index 1b949d5b68..8ba1d025f7 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -166,10 +166,13 @@ my $HAVE_NTLM_AUTH = (-e "/usr/bin/ntlm_auth"); &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); &General::readhash("${General::swroot}/main/settings", \%mainsettings); -my $green_cidr = &General::ipcidr("$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}"); +# Get and convert green network into CIDR format. +my $green_cidr = &Network::convert_to_cidr_or_mask("$netsettings{'GREEN_NETADDRESS'}\/$netsettings{'GREEN_NETMASK'}"); my $blue_cidr = ""; + +# If a blue zone exists, get and convert blue network into CIDR format. if (&Header::blue_used() && $netsettings{'BLUE_DEV'}) { - $blue_cidr = &General::ipcidr("$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}"); + $blue_cidr = &Network::convert_to_cidr_or_mask("$netsettings{'BLUE_NETADDRESS'}\/$netsettings{'BLUE_NETMASK'}"); } &Header::showhttpheaders(); -- 2.39.5