implement client::conf to fetch/set (with default) client configuration

[pxelator] / lib / PXElator / dhcpd.pm

diff --git a/lib/PXElator/dhcpd.pm b/lib/PXElator/dhcpd.pm
index 0c41be5..83f1cd3 100644 (file)
--- a/lib/PXElator/dhcpd.pm
+++ b/lib/PXElator/dhcpd.pm
@@ -19,7 +19,6 @@ use IO::Socket::INET;
 use File::Slurp;
 use Data::Dump qw/dump/;
 use Net::Ping;
-use Module::Refresh;
 
 use lib '..';
 use Net::DHCP::Packet;
@@ -27,7 +26,6 @@ use Net::DHCP::Constants 0.67;
 
 use server;
 my $debug = server::debug;
-use pxe;
 
 if ( ! $server::ip ) {
        my $server_ip = `/sbin/ifconfig`;
@@ -35,14 +33,14 @@ if ( ! $server::ip ) {
        $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 = "$server::base_dir/conf/$server::ip";
+       my $conf = $server::conf;
        mkdir $conf unless -e $conf;
 
        if ( -e "$conf/mac/$mac" ) {
@@ -51,35 +49,45 @@ sub client_ip {
                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 ) ) {
+
+       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;
-       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";
-       }
+
+       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;
 }
 
+use log;
+use config;
+use pxelinux;
+
+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';
@@ -108,6 +116,8 @@ sub process_packet {
 
 =cut
 
+       config::for_ip( $ip );
+
        my $packet = {
                Op              => BOOTREPLY(),
                Hops    => $dhcp->hops(),
@@ -118,10 +128,18 @@ sub process_packet {
                Siaddr  => $server::ip,
                Giaddr  => $dhcp->giaddr(),
                Chaddr  => $dhcp->chaddr(),
-               File    => $pxe::file,
+               File    => $file,
        };
 
-       pxe::config_for_ip( $ip );
+       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";
+               $packet->{ $DH0 } = $v;
+       }
 
        my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
@@ -131,15 +149,15 @@ sub process_packet {
                $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 $pxe::file";
+               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
 #                      $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_DOMAIN_NAME()}            = 'pxelator.lan';
+                       $packet->{DHO_NAME_SERVERS()}           = $server::ip;
 #                      $packet->{DHO_ROOT_PATH()}              = '/exports/foobar';
                } else {
                        $packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPNAK();
@@ -151,7 +169,9 @@ sub process_packet {
                log::mac $mac, "$messagetype igored (bootp?)";
        }
 
-       warn ">> $mac == $ip server: $server::ip", $pxe::file ? " pxe file: $pxe::file\n" : "\n" if $debug;
+       warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n" if $debug;
+
+warn "## created packet ", dump( $packet );
 
        $packet = new Net::DHCP::Packet( %$packet );
        warn "send ",$packet->toString() if $debug;
@@ -190,7 +210,6 @@ sub start {
        print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n";
 
        while (1) {
-               Module::Refresh->refresh;
                process_packet $sock;
        }
 }