--- lib/PXElator/dhcpd.pm	2009/07/30 21:31:30	67
+++ lib/PXElator/dhcpd.pm	2009/08/12 22:56:45	207
@@ -18,16 +18,15 @@
 use IO::Socket::INET;
 use File::Slurp;
 use Data::Dump qw/dump/;
-use Net::Ping;
-use Module::Refresh;
 
 use lib '..';
 use Net::DHCP::Packet;
 use Net::DHCP::Constants 0.67;
 
+use CouchDB;
+
 use server;
 my $debug = server::debug;
-use pxe;
 
 if ( ! $server::ip ) {
 	my $server_ip = `/sbin/ifconfig`;
@@ -35,57 +34,48 @@
 	$server::ip = $server_ip;
 }
 
-warn "server ip $server::ip file: $pxe::file range: $server::ip_from - $server::ip_to\n";
+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 ) = @_;
 
-	my $conf = "conf/$server::ip";
+	my $conf = $server::conf;
 	mkdir $conf unless -e $conf;
 
-	if ( -e "$conf/mac/$mac" ) {
-		my $ip = read_file "$conf/mac/$mac";
-		print "$mac old $ip\n";
-		return $ip;
-	}
-
-	mkdir $_ foreach grep { ! -e $_ } map { "$conf/$_" } ( 'ip', 'mac' );
-
-	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;
-	}
+	my $ip;
 
-	write_file "$conf/mac/$mac", $ip;
-	if ( -l "$conf/ip/$ip" && readlink "$conf/ip/$ip" ne "$conf/mac/$mac") {
-		unlink     "$conf/ip/$ip";
-		symlink    "$conf/mac/$mac", "$conf/ip/$ip";
-		warn "$mac IP changed to $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";
 	}
 
-	print "$mac NEW $ip\n";
-
 	return $ip;
 }
 
+use log;
+use config;
+use pxelinux;
+use client;
+
+our $file;
 our $transaction = 0; # FIXME predictible transaction numbers
 
 sub process_packet {
 	my $sock = shift;
 
+	server->refresh;
+
 	my $buf;
 	$sock->recv($buf, 1024);
 	my $size = 'empty';
 	$size = length($buf) . ' bytes' if defined $buf;
 
-	print "packet from ",$sock->peerhost,":",$sock->peerport," $size\n";
+	print "packet from ",$sock->peerhost,":",$sock->peerport," $size\n" if $debug;
 	return unless $buf;
 
 	my $dhcp = Net::DHCP::Packet->new($buf);
@@ -96,6 +86,12 @@
 	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 => $mac, ip => $ip, hostname => $hostname };
+	CouchDB::audit( 'request', $audit );
+
 =for later
 
 	my $user_class = $dhcp->getOptionValue(DHO_USER_CLASS());
@@ -108,6 +104,8 @@
 
 =cut
 
+	config::for_ip( $ip );
+
 	my $packet = {
 		Op		=> BOOTREPLY(),
 		Hops	=> $dhcp->hops(),
@@ -118,44 +116,78 @@
 		Siaddr	=> $server::ip,
 		Giaddr	=> $dhcp->giaddr(),
 		Chaddr	=> $dhcp->chaddr(),
-		File	=> $pxe::file,
+		File	=> $file,
+		DHO_DHCP_SERVER_IDENTIFIER()	=> $server::ip,	# busybox/udhcpc needs it but doesn't request
+	};
+
+	my $options = {
+		DHO_SUBNET_MASK()	=> $server::netmask,
+		DHO_ROUTERS()		=> $server::ip,
+		DHO_DOMAIN_NAME()	=> $server::domain_name,
+		DHO_NAME_SERVERS()	=> $server::ip,
+		DHO_DOMAIN_NAME_SERVERS() => $server::ip,
+		DHO_HOST_NAME()		=> client::conf( $ip, 'hostname' ),
+		DHO_BROADCAST_ADDRESS() => $server::bcast,
+#		DHO_NTP_SERVERS() => '',
 	};
 
-	pxe::config_for_ip( $ip );
+	my @requested = split(/\s/, $dhcp->getOptionValue(DHO_DHCP_PARAMETER_REQUEST_LIST));
+	warn "options ",dump( $options ), ' requested: ',dump( @requested ) if $debug;
+
+	my @missing;
+	foreach ( @requested ) {
+		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\n" if $debug;
+		$packet->{ $DH0 } = $v;
+	}
 
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
 	if ($messagetype eq DHCPDISCOVER()) {
-		warn "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());
-		warn "DHCP REQUEST $requested_ip";
+		$audit->{type} = 'request';
 		if ( $ip eq $requested_ip ) {
 			$packet->{DHO_DHCP_MESSAGE_TYPE()}      = DHCPACK();
 			$packet->{DHO_DHCP_LEASE_TIME()}        = 5 * 60; # 5 min
-#			$packet->{DHO_DHCP_SERVER_IDENTIFIER()} = $server::ip;		# FIXME
-			$packet->{DHO_SUBNET_MASK()}            = '255.255.255.0';
-			$packet->{DHO_ROUTERS()}                = $server::ip;
-#			$packet->{DHO_DOMAIN_NAME()}            = 'pxelator.lan';
-#			$packet->{DHO_NAME_SERVERS()}           = $server::ip;
 #			$packet->{DHO_ROOT_PATH()}              = '/exports/foobar';
 		} else {
 			$packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPNAK();
 			$packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip";
 		}
 	} elsif ($messagetype eq DHCPINFORM()) {
-		warn "DHCP INFORM ignored";
+		$audit->{type} = 'inform';
 	} else {
-		warn "$messagetype igored (bootp?)";
+		$audit->{type} = sprintf('ignored %x', $messagetype);
 	}
 
-	warn ">> $mac == $ip server: $server::ip", $pxe::file ? " pxe file: $pxe::file\n" : "\n";
+	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( 'response', $audit );
+
 	my $reply = IO::Socket::INET->new(
 		LocalAddr => $server::ip,
 		LocalPort => 67,
@@ -189,8 +221,9 @@
 
 	print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n";
 
+	CouchDB::audit( 'start', { 'listen' => { addr => $sock->sockhost, port => $sock->sockport } } );
+
 	while (1) {
-		Module::Refresh->refresh;
 		process_packet $sock;
 	}
 }