--- lib/PXElator/client.pm	2009/08/10 17:30:01	194
+++ lib/PXElator/client.pm	2009/08/15 13:44:13	219
@@ -4,9 +4,35 @@
 use strict;
 use autodie;
 
-use server;
 use File::Slurp;
 use Net::Ping;
+use Carp qw/confess/;
+
+use server;
+use format;
+
+sub mkbasedir {
+	my $path = shift;
+	$path =~ s{(^.*)/[^/]+$}{$1};
+	mkdir $path unless -d $path;
+	return $path;
+}
+
+sub mac_path { $server::conf . '/mac/' . $_[0] }
+sub  ip_path { $server::conf . '/ip/'  . join('/', @_) }
+sub conf_value {
+	my $path = shift;
+	my $value;
+	if ( -l $path ) {
+		$value = readlink $path;
+		$value =~ s{.*/([^/]+)$}{$1};
+	} elsif ( -f $path ) {
+		$value = read_file $path;
+	} else {
+		confess "$path not file or symlink";
+	}
+	return $value;
+}
 
 sub conf {
 	my $ip  = shift;
@@ -18,40 +44,29 @@
 		$default = $_[1]
 	}
 
-	my $path ="$server::conf/ip/$ip";
+	my $path = ip_path $ip;
 	mkdir $path unless -d $path;
 	$path .= '/' . $name;
 
 	if ( defined $value ) {
+		mkbasedir  $path;
 		write_file $path, $value;
 		warn "update $path = $value";
 	} elsif ( ! -e $path && defined $default ) {
+		mkbasedir  $path;
 		write_file $path, $default;
 		warn "default $path = $default";
 		$value = $default;
-	} elsif ( -e $path ) {
-		if ( -l $path ) {
-			$value = readlink $path;
-			$value =~ s{.*/([^/]+)$}{$1};
-		} else {
-			$value = read_file $path;
-		}
+	} elsif ( -f $path ) {
+		$value = read_file $path;
+	} else {
+		confess "conf $name";
 	}
 	return $value;
 }
 
-sub mac {
-	my ( $ip, $op ) = @_;
-	$op ||= 'html';
-	my $mac = client::conf( $ip, 'mac' );
-	return '' unless $mac;
-	$mac =~ s{(..)}{$1:}g;
-	$mac =~ s{:$}{};
-	$mac = qq|<tt>$mac</tt>| 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;
 
@@ -60,24 +75,32 @@
 	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);
+
+	my $mac_path = mac_path($mac);
+	unlink $mac_path if -e $mac_path;	# XXX audit?
+	symlink ip_path($ip), $mac_path;
+	write_file ip_path($ip,'mac'), $mac;
+
 	return $ip;
 
 }
 
-sub ip_from_mac {
+sub ip_from_mac($) {
 	my $mac = shift;
 
 	$mac = lc $mac;
 	$mac =~ s{:}{}g;
 
-	my $mac_path = "$server::conf/mac/$mac";
+	my $mac_path = mac_path $mac;
 	return unless -e $mac_path;
 
 	my $ip;
@@ -85,11 +108,10 @@
 	if ( -f $mac_path ) {
 		$ip = read_file $mac_path;
 		unlink $mac_path;
-		symlink "$server::conf/ip/$ip", $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};
+		$ip = conf_value $mac_path;
 	} else {
 		die "$mac_path not file or symlink";
 	}
@@ -97,4 +119,17 @@
 	return $ip;
 }
 
+sub mac_from_ip($) {
+	my $ip = shift;
+	conf_value 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;