--- lib/PXElator/client.pm 2009/08/06 21:31:10 168
+++ lib/PXElator/client.pm 2009/08/11 15:55:26 200
@@ -8,6 +8,9 @@
use File::Slurp;
use Net::Ping;
+sub mac_path { $server::conf . '/mac/' . $_[0] }
+sub ip_path { $server::conf . '/ip/' . join('/', @_) }
+
sub conf {
my $ip = shift;
my $name = shift;
@@ -18,7 +21,7 @@
$default = $_[1]
}
- my $path ="$server::conf/ip/$ip";
+ my $path = ip_path $ip;
mkdir $path unless -d $path;
$path .= '/' . $name;
@@ -41,15 +44,18 @@
}
sub mac {
- my $ip = shift;
+ my ( $ip, $op ) = @_;
+ $op ||= 'html';
my $mac = client::conf( $ip, 'mac' );
+ return '' unless $mac;
$mac =~ s{(..)}{$1:}g;
$mac =~ s{:$}{};
- $mac = qq|$mac| if (caller(1))[3] =~ m{^httpd};
+ $mac = qq|$mac| if (caller(1))[3] =~ m{^httpd} && $op ne 'clean';
return uc($mac);
}
-sub next_ip {
+sub next_ip($) {
+ my $mac = shift;
my $p = Net::Ping->new;
@@ -58,15 +64,60 @@
my $addr = $server::ip_from || die;
my $ip = $prefix . $addr;
- while ( -e "$server::conf/ip/$ip" || $p->ping( $ip, 0.7 ) ) {
+ while ( -e ip_path($ip) || $p->ping( $ip, 0.7 ) ) {
$ip = $prefix . $addr++;
die "all addresses allocated!" if $addr == $server::ip_to;
warn "skip $ip\n";
}
warn "next_ip $ip\n";
+
+ mkdir ip_path($ip);
+
+ symlink ip_path($ip), mac_path($mac);
+ write_file ip_path($ip,'mac'), $mac;
+
+ return $ip;
+
+}
+
+sub ip_from_mac($) {
+ my $mac = shift;
+
+ $mac = lc $mac;
+ $mac =~ s{:}{}g;
+
+ my $mac_path = mac_path $mac;
+ return unless -e $mac_path;
+
+ my $ip;
+
+ if ( -f $mac_path ) {
+ $ip = read_file $mac_path;
+ unlink $mac_path;
+ symlink ip_path($ip), $mac_path;
+ warn "I: upgrade to mac symlink $mac_path\n";
+ } elsif ( -l $mac_path ) {
+ $ip = readlink $mac_path;
+ $ip =~ s{^.+/([^/]+)$}{$1};
+ } else {
+ die "$mac_path not file or symlink";
+ }
+
return $ip;
+}
+
+sub mac_from_ip($) {
+ my $ip = shift;
+ return read_file ip_path($ip, 'mac');
+}
+sub change_ip($$) {
+ my ($old, $new) = @_;
+ my $mac = mac_from_ip($old);
+ rename ip_path($old), ip_path($new);
+ unlink mac_path($mac);
+ symlink ip_path($new), mac_path($mac);
}
1;