--- lib/PXElator/dhcpd.pm	2009/08/06 18:09:17	160
+++ lib/PXElator/dhcpd.pm	2009/08/16 22:51:57	232
@@ -18,12 +18,14 @@
 use IO::Socket::INET;
 use File::Slurp;
 use Data::Dump qw/dump/;
-use Net::Ping;
 
 use lib '..';
 use Net::DHCP::Packet;
 use Net::DHCP::Constants 0.67;
 
+use CouchDB;
+use format;
+
 use server;
 my $debug = server::debug;
 
@@ -35,7 +37,7 @@
 
 warn "server ip $server::ip range: $server::ip_from - $server::ip_to\n";
 
-my $addr = $server::ip_from;
+use client;
 
 sub client_ip {
 	my ( $mac ) = @_;
@@ -43,36 +45,16 @@
 	my $conf = $server::conf;
 	mkdir $conf unless -e $conf;
 
-	if ( -e "$conf/mac/$mac" ) {
-		my $ip = read_file "$conf/mac/$mac";
+	my $ip;
+
+	if ( $ip = client::ip_from_mac( $mac ) ) {
 		print "RENEW $mac $ip\n";
 		return $ip;
+	} else {
+		$ip = client::next_ip( $mac );
+		print "NEW $mac $ip\n";
 	}
 
-	my $p = Net::Ping->new;
-
-	my $prefix = $server::ip;
-	$prefix =~ s{\.\d+$}{.};
-	my $ip = $prefix . $addr;
-
-	while ( -e "$conf/ip/$ip" || $p->ping( $ip ) ) {
-		$ip = $prefix . $addr++;
-		die "all addresses allocated!" if $addr == $server::ip_to;
-	}
-
-	write_file "$conf/mac/$mac", $ip;
-
-	my $ip_path = "$conf/ip/$ip";
-	mkdir $ip_path unless -e $ip_path;
-
-	if ( -l "$ip_path/mac" && readlink "$ip_path/mac" ne "$conf/mac/$mac" ) {
-		warn "$mac IP changed from ", readlink "$ip_path/mac", " to $ip";
-		unlink "$ip_path/mac";
-	};
-	symlink "$conf/mac/$mac", "$ip_path/mac";
-
-	print "$mac NEW $ip\n";
-
 	return $ip;
 }
 
@@ -105,6 +87,11 @@
 	my $mac = substr($dhcp->chaddr(),0,$dhcp->hlen()*2);
 	my $ip = client_ip($mac);
 
+	my $hostname = $dhcp->getOptionValue(DHO_HOST_NAME);
+	print "$ip ", client::conf( $ip => 'hostname', default => $hostname ), " >> /etc/hosts\n";
+
+	my $audit = { mac => format::mac($mac), ip => $ip, hostname => $hostname };
+
 =for later
 
 	my $user_class = $dhcp->getOptionValue(DHO_USER_CLASS());
@@ -145,30 +132,40 @@
 	};
 
 	my @requested = split(/\s/, $dhcp->getOptionValue(DHO_DHCP_PARAMETER_REQUEST_LIST));
-	warn "options ",dump( $options ), ' requested: ',dump( @requested );
+	warn "options ",dump( $options ), ' requested: ',dump( @requested ) if $debug;
+
+	my @missing;
 	foreach ( @requested ) {
-		$packet->{$_} = $options->{$_} if defined $options->{$_};
+		if ( defined $options->{$_} ) {
+			$packet->{$_} = $options->{$_};
+		} else {
+			push @missing, $_;
+		}
 	}
 
+	warn "W: options requested but missing: ",dump( @missing ),$/;
+	$audit->{requested} = [ @requested ];
+	$audit->{missing}   = [ @missing   ];
+
 	foreach my $opt ( 'magic', 'config_file', 'path_prefix', 'reboot_time' ) {
 		my $DH0 = eval 'DHO_PXELINUX_' . uc $opt;
 		warn "DH0: $@" if $@;
 		my $v = eval "\$pxelinux::$opt";
 		warn "v: $@" if $@;
 		next unless defined $v;
-		warn "pxelinux dhcp option $opt = $DH0 = $v";
+		warn "pxelinux dhcp option $opt = $DH0 = $v\n" if $debug;
 		$packet->{ $DH0 } = $v;
 	}
 
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
 	if ($messagetype eq DHCPDISCOVER()) {
-		log::mac $mac, "DHCP DISCOVER";
+		$audit->{type} = 'discover';
 		$packet->{Comment} = $dhcp->comment();
 		$packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPOFFER();
 	} elsif ($messagetype eq DHCPREQUEST()) {
 		my $requested_ip = $dhcp->getOptionValue(DHO_DHCP_REQUESTED_ADDRESS());
-		log::mac $mac, "DHCP REQUEST $requested_ip $ip $file";
+		$audit->{type} = 'request';
 		if ( $ip eq $requested_ip ) {
 			$packet->{DHO_DHCP_MESSAGE_TYPE()}      = DHCPACK();
 			$packet->{DHO_DHCP_LEASE_TIME()}        = 5 * 60; # 5 min
@@ -178,18 +175,19 @@
 			$packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip";
 		}
 	} elsif ($messagetype eq DHCPINFORM()) {
-		log::mac $mac, "DHCP INFORM ignored";
+		$audit->{type} = 'inform';
 	} else {
-		log::mac $mac, "$messagetype igored (bootp?)";
+		$audit->{type} = sprintf('ignored %x', $messagetype);
 	}
 
-	warn "packet ",dump( $packet );
-
 	warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n" if $debug;
+	$audit->{response} = $packet;
 
 	$packet = new Net::DHCP::Packet( %$packet );
 	warn "send ",$packet->toString() if $debug;
 
+	CouchDB::audit( $audit->{type}, $audit );
+
 	my $reply = IO::Socket::INET->new(
 		LocalAddr => $server::ip,
 		LocalPort => 67,
@@ -223,6 +221,8 @@
 
 	print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n";
 
+	CouchDB::audit( 'start', { addr => $sock->sockhost, port => $sock->sockport } );
+
 	while (1) {
 		process_packet $sock;
 	}