force dhcp server configuration with dhcpd.pl

diff --git a/lib/PXElator/dhcpd.pm b/lib/PXElator/dhcpd.pm
index 885539c..df6df27 100644 (file)
--- a/lib/PXElator/dhcpd.pm
+++ b/lib/PXElator/dhcpd.pm
@@ -121,6 +121,15 @@ sub process_packet {
 
        config::for_ip( $ip );
 
+       my $server;
+       map { $server->{ $_ } = eval '$server::' . $_ } ( 'ip', 'netmask', 'bcast', 'domain' );
+
+       if ( my $force = client::conf( $ip => 'dhcpd.pl' ) ) {
+               eval $force;
+               die "$force\n$@" if $@;
+               warn "force server ", dump $server;
+       }
+
        my $packet = {
                Op              => BOOTREPLY(),
                Hops    => $dhcp->hops(),
@@ -128,21 +137,21 @@ sub process_packet {
                Flags   => $dhcp->flags(),
                Ciaddr  => $dhcp->ciaddr(),
                Yiaddr  => $ip,
-               Siaddr  => $server::ip,
+               Siaddr  => $server->{ip},
                Giaddr  => $dhcp->giaddr(),
                Chaddr  => $dhcp->chaddr(),
                File    => $file,
-               DHO_DHCP_SERVER_IDENTIFIER()    => $server::ip, # busybox/udhcpc needs it but doesn't request
+               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,
-               DHO_NAME_SERVERS()      => $server::ip,
-               DHO_DOMAIN_NAME_SERVERS() => $server::ip,
+               DHO_SUBNET_MASK()       => $server->{netmask},
+               DHO_ROUTERS()           => $server->{ip},
+               DHO_DOMAIN_NAME()       => $server->{domain},
+               DHO_NAME_SERVERS()      => $server->{ip},
+               DHO_DOMAIN_NAME_SERVERS() => $server->{ip},
                DHO_HOST_NAME()         => client::conf( $ip, 'hostname' ),
-               DHO_BROADCAST_ADDRESS() => $server::bcast,
+               DHO_BROADCAST_ADDRESS() => $server->{bcast},
 #              DHO_NTP_SERVERS() => '',
        };
 
@@ -211,18 +220,18 @@ sub process_packet {
                my $buff = $packet->serialize();
 
                my $reply = IO::Socket::INET->new(
-                       LocalAddr => $server::ip,
+                       LocalAddr => $server->{ip},
                        LocalPort => 67,
                        Proto => "udp",
                        Broadcast => 1,
 #                      PeerAddr => '255.255.255.255',
-                       PeerAddr => $server::bcast,
+                       PeerAddr => $server->{bcast},
                        PeerPort => 68,
                        Reuse => 1,
                ) or die "socket: $@";
 
                $reply->send( $buff, 0 ) or die "Error sending: $!\n";
-               warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n";
+               warn ">> $mac == $ip server: $server->{ip}", $file ? " file: $file\n" : "\n";
        } else {
                $audit->{error} = "$ip not in server range $server::ip $server::netmask - no packet sent";
                warn $audit->{error};

diff --git a/lib/PXElator/ip.pm b/lib/PXElator/ip.pm
index 9651883..c5d2533 100644 (file)
--- a/lib/PXElator/ip.pm
+++ b/lib/PXElator/ip.pm
@@ -120,6 +120,9 @@ sub from_int {
 
 sub in_dhcp_range {
        my $ip = shift;
+
+       return 1 if -e "$server::conf/ip/$ip/dhcpd.pl";
+
        my $i = to_int($ip) & to_int($server::netmask);
        my $s = to_int($server::ip) & to_int($server::netmask);
 

diff --git a/lib/PXElator/t/ip.t b/lib/PXElator/t/ip.t
index 43fdb74..fd49820 100755 (executable)
--- a/lib/PXElator/t/ip.t
+++ b/lib/PXElator/t/ip.t
@@ -4,7 +4,7 @@ use warnings;
 use strict;
 use autodie;
 
-use Test::More tests => 12;
+use Test::More tests => 13;
 use Data::Dump qw/dump/;
 
 use_ok 'ip';
@@ -31,3 +31,6 @@ $ip_in_range = ip::from_int($ip_in_range);
 
 ok(   ip::in_dhcp_range( $ip_in_range ), "in_dhcp_range $ip_in_range" );
 ok( ! ip::in_dhcp_range( '4.2.2.2' ), 'not in_dhcp_range' );
+
+my $force_dhcp_ip = '10.60.0.200';
+ok(   ip::in_dhcp_range( $force_dhcp_ip ), "force in_dhcp_range $force_dhcp_ip" );