projects
/
pxelator
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6655f29
)
use server::as_hash_for to customize in_dhcp_range
author
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sat, 2 Jan 2010 17:45:31 +0000
(17:45 +0000)
committer
Dobrica Pavlinusic
<dpavlin@rot13.org>
Sat, 2 Jan 2010 17:45:31 +0000
(17:45 +0000)
lib/PXElator/ip.pm
patch
|
blob
|
history
diff --git
a/lib/PXElator/ip.pm
b/lib/PXElator/ip.pm
index
c5d2533
..
ae7204a
100644
(file)
--- a/
lib/PXElator/ip.pm
+++ b/
lib/PXElator/ip.pm
@@
-121,14
+121,14
@@
sub from_int {
sub in_dhcp_range {
my $ip = shift;
sub in_dhcp_range {
my $ip = shift;
-
return 1 if -e "$server::conf/ip/$ip/dhcpd.pl"
;
+
my $server = server::as_hash_for $ip
;
- my $i = to_int($ip) & to_int($server
::netmask
);
- my $s = to_int($server
::ip) & to_int($server::netmask
);
+ my $i = to_int($ip) & to_int($server
->{netmask}
);
+ my $s = to_int($server
->{ip}) & to_int($server->{netmask}
);
if ( $i == $s ) {
if ( $i == $s ) {
- $i = to_int($ip) & ( to_int($server
::netmask
) ^ 0xffffffff );
- return 1 if ( $i >= $server
::ip_from && $i <= $server::ip_to
);
+ $i = to_int($ip) & ( to_int($server
->{netmask}
) ^ 0xffffffff );
+ return 1 if ( $i >= $server
->{ip_from} && $i <= $server->{ip_to}
);
}
return 0;
}
}
return 0;
}