--- lib/PXElator/dhcpd.pm	2009/08/03 08:52:32	118
+++ lib/PXElator/dhcpd.pm	2009/08/10 17:30:01	194
@@ -18,7 +18,6 @@
 use IO::Socket::INET;
 use File::Slurp;
 use Data::Dump qw/dump/;
-use Net::Ping;
 
 use lib '..';
 use Net::DHCP::Packet;
@@ -35,46 +34,42 @@
 
 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 = "$server::base_dir/conf/$server::ip";
+	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;
+		print "NEW $mac $ip\n";
+		symlink "$conf/ip/$ip", "$conf/mac/$mac";
 	}
 
-	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_path = "$conf/ip/$ip";
+	mkdir $ip_path unless -e $ip_path;
 
-	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 ( -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";
+	};
 
-	print "$mac NEW $ip\n";
+	symlink "$conf/mac/$mac", "$ip_path/mac";
 
 	return $ip;
 }
 
 use log;
 use config;
+use pxelinux;
+use client;
 
 our $file;
 our $transaction = 0; # FIXME predictible transaction numbers
@@ -82,6 +77,8 @@
 sub process_packet {
 	my $sock = shift;
 
+	server->refresh;
+
 	my $buf;
 	$sock->recv($buf, 1024);
 	my $size = 'empty';
@@ -123,13 +120,44 @@
 		Giaddr	=> $dhcp->giaddr(),
 		Chaddr	=> $dhcp->chaddr(),
 		File	=> $file,
+		DHO_DHCP_SERVER_IDENTIFIER()	=> $server::ip,	# busybox/udhcpc needs it but doesn't request
+	};
 
-		DHO_PXELINUX_MAGIC()       => 0xF100747E,
-		DHO_PXELINUX_CONFIG_FILE() => 'pxelinux.cfg/default',
-		DHO_PXELINUX_PATH_PREFIX() => 'live-helper/tftpboot/',
-		DHO_PXELINUX_REBOOT_TIME() => 5, # default: 300 s
+	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() => '',
 	};
 
+	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 ),$/;
+
+	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()) {
@@ -142,11 +170,6 @@
 		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();