From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernhard Held To: development@lists.ipfire.org Subject: [PATCH 2/2] proxy.cgi: fix subnet comparison Date: Sun, 11 Feb 2018 19:51:22 +0100 Message-ID: <20180211185122.9243-3-berny156@gmx.de> In-Reply-To: <20180211185122.9243-1-berny156@gmx.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5792128635407538614==" List-Id: --===============5792128635407538614== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The logic of subnet comparison is broken. E.g. if the blue netmask is 255.255.255.0, it's impossible to add a VPN subnet with the same netmask. The proposed patch compares the subnets individually. --- html/cgi-bin/proxy.cgi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi index ea3b41126..4993dde86 100644 --- a/html/cgi-bin/proxy.cgi +++ b/html/cgi-bin/proxy.cgi @@ -3066,8 +3066,8 @@ END @temp =3D split(/\//); chomp $temp[1]; if ( - ($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($temp[1] ne $netsett= ings{'GREEN_NETMASK'}) && - ($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) && ($temp[1] ne $netsetti= ngs{'BLUE_NETMASK'}) + (($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) || ($temp[1] ne $netset= tings{'GREEN_NETMASK'})) && + (($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) || ($temp[1] ne $netsett= ings{'BLUE_NETMASK'})) ) { print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\= "))"; --=20 2.16.1 --===============5792128635407538614==--