From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Marx To: development@lists.ipfire.org Subject: [PATCH] Cleanup2017: make network_equal more robust Date: Mon, 26 Jun 2017 12:52:01 +0200 Message-ID: <1498474321-14745-1-git-send-email-alexander.marx@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8422384150738656910==" List-Id: --===============8422384150738656910== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Michael fixed this in a telephone session --- config/cfgroot/network-functions.pl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun= ctions.pl index 66f1ed5..41632c3 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -108,14 +108,22 @@ 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); + if (scalar @bin1 ne 2) { + return undef; + } =20 - if ($bin1 eq $bin2) { - return 1; + my @bin2 =3D &network2bin($network2); + if (scalar @bin2 ne 2) { + return undef; } =20 - return 0; + my $address1 =3D $bin1[0]; + my $netmask1 =3D $bin1[1]; + my $address2 =3D $bin2[0]; + my $netmask2 =3D $bin2[1]; + + return (($address1 eq $address2) && ($netmask1 eq $netmask2)); } =20 # Takes a network in either a.b.c.d/a.b.c.d or a.b.c.d/e notation --=20 2.7.4 --===============8422384150738656910==--