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 (!defined $bin1 || !defined $bin2) {
+ return undef;
+ }
+
+ if ($bin1[0] eq $bin2[0] && $bin1[1] eq $bin2[1]) {
return 1;
}
my $address_bin = &ip2bin($address);
my $netmask_bin = &ip2bin($netmask);
+ if (!defined $address_bin || !defined $netmask_bin) {
+ return undef;
+ }
+
my $network_start = $address_bin & $netmask_bin;
return ($network_start, $netmask_bin);
return $ret;
}
+sub get_nic_property {
+ my $nicname = shift;
+ my $property = shift;
+ my $result;
+
+ open(FILE, "/sys/class/net/$nicname/$property") or die("Could not read property");
+ $result = <FILE>;
+ close(FILE);
+
+ chomp($result);
+
+ return $result;
+}
+
+sub valid_mac($) {
+ my $mac = shift;
+
+ return $mac =~ /^([0-9A-Fa-f]{2}[:]){5}([0-9A-Fa-f]{2})$/;
+}
+
+sub random_mac {
+ my $address = "02";
+
+ for my $i (0 .. 4) {
+ $address = sprintf("$address:%02x", int(rand(255)));
+ }
+
+ return $address;
+}
+
+sub get_mac_by_name($) {
+ my $mac = shift;
+
+ if ((!&valid_mac($mac)) && ($mac ne "")) {
+ if (-e "/sys/class/net/$mac/") {
+ $mac = get_nic_property($mac, "address");
+ }
+ }
+
+ return $mac;
+}
+
1;
# Remove the next line to enable the 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);