From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] BUG11466: Fix network_equal function Date: Tue, 07 Nov 2017 14:17:27 +0100 Message-ID: <1510060647-12424-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6957181090092317336==" List-Id: --===============6957181090092317336== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The network_equal function only tested the subnet addresses of two given netw= orks which lead to errormessages saying "This is the green network" The fix tests netwok and subnet IP's to fix this --- config/cfgroot/network-functions.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun= ctions.pl index 93b8190..25f9af1 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -108,10 +108,10 @@ sub network_equal { my $network1 =3D shift; my $network2 =3D shift; =20 - my $bin1 =3D &network2bin($network1); - my $bin2 =3D &network2bin($network2); + my @bin1 =3D &network2bin($network1); + my @bin2 =3D &network2bin($network2); =20 - if ($bin1 eq $bin2) { + if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) { return 1; } =20 @@ -457,7 +457,7 @@ sub testsuite() { assert(!$result); =20 $result =3D &network_equal("192.168.0.1/24", "192.168.0.XXX/24"); - assert($result); + assert(!$result); =20 $result =3D &ip_address_in_network("10.0.1.4", "10.0.0.0/8"); assert($result); --=20 2.7.4 --===============6957181090092317336==--