webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

BUG11466: Fix network_equal function

Browse Source 
The network_equal function only tested the subnet addresses of two given networks which lead to
errormessages saying "This is the green network"
The fix tests netwok and subnet IP's to fix this

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Alexander Marx
2017-11-07 14:17:27 +01:00
committed by Michael Tremer
parent b3d2f86b87
commit 1047805dba
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/cfgroot/network-functions.pl
View File

@@ -108,10 +108,10 @@ sub network_equal {
my $network1 = shift;
my $network2 = shift;
my $bin1 = &network2bin($network1);
my $bin2 = &network2bin($network2);
my @bin1 = &network2bin($network1);
my @bin2 = &network2bin($network2);
if ($bin1 eq $bin2) {
if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
return 1;
}
@@ -457,7 +457,7 @@ sub testsuite() {
assert(!$result);
$result = &network_equal("192.168.0.1/24", "192.168.0.XXX/24");
assert($result);
assert(!$result);
$result = &ip_address_in_network("10.0.1.4", "10.0.0.0/8");
assert($result);