--- lib/PXElator/dhcpd.pm	2009/07/29 20:55:44	44
+++ lib/PXElator/dhcpd.pm	2009/07/29 22:04:58	45
@@ -26,21 +26,19 @@
 use Net::DHCP::Constants 0.67;
 
 use server;
+use pxe;
 
 my $debug = 1;
 
-our ( $file, $gpxe_file );
-our ( $ip_from, $ip_to ) = ( 10, 100 );
-
 if ( ! $server::ip ) {
 	my $server_ip = `/sbin/ifconfig`;
 	$server_ip =~ s/^.+?addr:([\d\.]+).*$/$1/gs;
 	$server::ip = $server_ip;
 }
 
-warn "server ip $server::ip\n";
+warn "server ip $server::ip file: $pxe::file range: $server::ip_from - $server::ip_to\n";
 
-my $addr = $ip_from;
+my $addr = $server::ip_from;
 
 sub client_ip {
 	my ( $mac ) = @_;
@@ -63,7 +61,7 @@
 	my $ip = $prefix . $addr;
 	while ( -e "conf/ip/$ip" || $p->ping( $ip ) ) {
 		$ip = $prefix . $addr++;
-		die "all addresses allocated!" if $addr == $ip_to;
+		die "all addresses allocated!" if $addr == $server::ip_to;
 	}
 
 	write_file "$conf/mac/$mac", $ip;
@@ -121,7 +119,7 @@
 		Siaddr	=> $server::ip,
 		Giaddr	=> $dhcp->giaddr(),
 		Chaddr	=> $dhcp->chaddr(),
-		File	=> $file,
+		File	=> $pxe::file,
 	};
 
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
@@ -152,7 +150,7 @@
 		warn "$messagetype igored (bootp?)";
 	}
 
-	warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n";
+	warn ">> $mac == $ip server: $server::ip", $pxe::file ? " pxe file: $pxe::file\n" : "\n";
 
 	$packet = new Net::DHCP::Packet( %$packet );
 	warn "## ",$packet->toString(),"\n" if $debug;
@@ -196,4 +194,6 @@
 	}
 }
 
+warn "loaded";
+
 1;