--- lib/PXElator/dhcpd.pm	2009/07/29 22:04:58	45
+++ lib/PXElator/dhcpd.pm	2009/08/02 02:04:00	110
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+package dhcpd;
 
 =head1 dhcpd
 
@@ -26,9 +26,7 @@
 use Net::DHCP::Constants 0.67;
 
 use server;
-use pxe;
-
-my $debug = 1;
+my $debug = server::debug;
 
 if ( ! $server::ip ) {
 	my $server_ip = `/sbin/ifconfig`;
@@ -36,19 +34,19 @@
 	$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;
 
 sub client_ip {
 	my ( $mac ) = @_;
 
-	my $conf = "conf/$server::ip";
+	my $conf = "$server::base_dir/conf/$server::ip";
 	mkdir $conf unless -e $conf;
 
 	if ( -e "$conf/mac/$mac" ) {
 		my $ip = read_file "$conf/mac/$mac";
-		print "$mac old $ip\n";
+		print "RENEW $mac $ip\n";
 		return $ip;
 	}
 
@@ -76,6 +74,10 @@
 	return $ip;
 }
 
+use log;
+use config;
+
+our $file;
 our $transaction = 0; # FIXME predictible transaction numbers
 
 sub process_packet {
@@ -86,13 +88,13 @@
 	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);
 	$dhcp->comment( $transaction++ );
 
-	warn "recv: ", $dhcp->toString;
+	warn "recv: ", $dhcp->toString if $debug;
 
 	my $mac = substr($dhcp->chaddr(),0,$dhcp->hlen()*2);
 	my $ip = client_ip($mac);
@@ -109,6 +111,8 @@
 
 =cut
 
+	config::for_ip( $ip );
+
 	my $packet = {
 		Op		=> BOOTREPLY(),
 		Hops	=> $dhcp->hops(),
@@ -119,18 +123,18 @@
 		Siaddr	=> $server::ip,
 		Giaddr	=> $dhcp->giaddr(),
 		Chaddr	=> $dhcp->chaddr(),
-		File	=> $pxe::file,
+		File	=> $file,
 	};
 
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
 	if ($messagetype eq DHCPDISCOVER()) {
-		warn "DHCP DISCOVER";
+		log::mac $mac, "DHCP 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";
+		log::mac $mac, "DHCP REQUEST $requested_ip $ip $file";
 		if ( $ip eq $requested_ip ) {
 			$packet->{DHO_DHCP_MESSAGE_TYPE()}      = DHCPACK();
 			$packet->{DHO_DHCP_LEASE_TIME()}        = 5 * 60; # 5 min
@@ -145,15 +149,15 @@
 			$packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip";
 		}
 	} elsif ($messagetype eq DHCPINFORM()) {
-		warn "DHCP INFORM ignored";
+		log::mac $mac, "DHCP INFORM ignored";
 	} else {
-		warn "$messagetype igored (bootp?)";
+		log::mac $mac, "$messagetype igored (bootp?)";
 	}
 
-	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;
 
 	$packet = new Net::DHCP::Packet( %$packet );
-	warn "## ",$packet->toString(),"\n" if $debug;
+	warn "send ",$packet->toString() if $debug;
 
 	my $reply = IO::Socket::INET->new(
 		LocalAddr => $server::ip,