--- lib/PXElator/dhcpd.pm 2009/08/06 20:14:43 167 +++ lib/PXElator/dhcpd.pm 2009/09/13 10:53:41 428 @@ -18,12 +18,14 @@ use IO::Socket::INET; use File::Slurp; use Data::Dump qw/dump/; -use Net::Ping; use lib '..'; use Net::DHCP::Packet; use Net::DHCP::Constants 0.67; +use CouchDB; +use format; + use server; my $debug = server::debug; @@ -35,44 +37,34 @@ warn "server ip $server::ip range: $server::ip_from - $server::ip_to\n"; -my $addr = $server::ip_from; +use client; + +sub client_mac_ip { + my ( $mac, $request_ip ) = @_; -sub client_ip { - my ( $mac ) = @_; + if ( ! $mac ) { + warn "W: no mac in requiest\n"; + return; + } 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"; + client::save_ip_mac( $ip, $mac ); return $ip; + } elsif ( ip::in_dhcp_range( $request_ip ) || $request_ip eq '0.0.0.0' ) { + $ip = client::next_ip( $mac ); + print "NEW $mac $ip\n"; + } else { + $ip = $request_ip; + client::save_ip_mac( $ip, $mac ); + warn "W: $ip our of server range $server::ip $server::netmask\n"; } - 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; - } - - write_file "$conf/mac/$mac", $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; } @@ -87,8 +79,6 @@ sub process_packet { my $sock = shift; - server->refresh; - my $buf; $sock->recv($buf, 1024); my $size = 'empty'; @@ -98,12 +88,24 @@ return unless $buf; my $dhcp = Net::DHCP::Packet->new($buf); - $dhcp->comment( $transaction++ ); warn "recv: ", $dhcp->toString if $debug; - my $mac = substr($dhcp->chaddr(),0,$dhcp->hlen()*2); - my $ip = client_ip($mac); + $dhcp->comment( $transaction++ ); + + my $mac = format::mac( substr($dhcp->chaddr(),0,$dhcp->hlen()*2) ); + my $ip = client_mac_ip($mac, $dhcp->ciaddr); + + my $hostname = $dhcp->getOptionValue(DHO_HOST_NAME); + print "$ip ", client::conf( $ip => 'hostname', default => $hostname ), " >> /etc/hosts\n" if $hostname; + + my $audit = { mac => $mac, ip => $ip, hostname => $hostname, + options => { + map { + ( $_ => $dhcp->getOptionValue( $_ ) ) + } @{ $dhcp->{options_order} } + }, + }; =for later @@ -136,7 +138,7 @@ my $options = { DHO_SUBNET_MASK() => $server::netmask, DHO_ROUTERS() => $server::ip, - DHO_DOMAIN_NAME() => $server::domain_name, + DHO_DOMAIN_NAME() => $server::domain, DHO_NAME_SERVERS() => $server::ip, DHO_DOMAIN_NAME_SERVERS() => $server::ip, DHO_HOST_NAME() => client::conf( $ip, 'hostname' ), @@ -156,7 +158,9 @@ } } - warn "W: options requested but missing: ",dump( @missing ); + warn "W: options requested but missing: ",dump( @missing ),$/; + $audit->{requested} = [ @requested ]; + $audit->{missing} = [ @missing ]; foreach my $opt ( 'magic', 'config_file', 'path_prefix', 'reboot_time' ) { my $DH0 = eval 'DHO_PXELINUX_' . uc $opt; @@ -170,44 +174,61 @@ my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE()); + my @type; + if ($messagetype eq DHCPDISCOVER()) { - log::mac $mac, "DHCP DISCOVER"; $packet->{Comment} = $dhcp->comment(); $packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPOFFER(); + @type = qw( discover offer ); } elsif ($messagetype eq DHCPREQUEST()) { - my $requested_ip = $dhcp->getOptionValue(DHO_DHCP_REQUESTED_ADDRESS()); - log::mac $mac, "DHCP REQUEST $requested_ip $ip $file"; + @type = qw( request ); + my $requested_ip = $dhcp->getOptionValue(DHO_DHCP_REQUESTED_ADDRESS()) || $dhcp->ciaddr(); if ( $ip eq $requested_ip ) { $packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPACK(); $packet->{DHO_DHCP_LEASE_TIME()} = 5 * 60; # 5 min # $packet->{DHO_ROOT_PATH()} = '/exports/foobar'; + $type[1] = 'ack'; } else { $packet->{DHO_DHCP_MESSAGE_TYPE()} = DHCPNAK(); - $packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip"; + $packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip got $requested_ip"; + $type[1] = 'nak'; } } elsif ($messagetype eq DHCPINFORM()) { - log::mac $mac, "DHCP INFORM ignored"; + @type = qw( inform ignored ); } else { - log::mac $mac, "$messagetype igored (bootp?)"; + @type = ( $messagetype, 'ignored' ); } - warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n" if $debug; + warn "# type ",dump @type; + $audit->{type} = [ @type ]; + + $audit->{response} = $packet; $packet = new Net::DHCP::Packet( %$packet ); warn "send ",$packet->toString() if $debug; - my $reply = IO::Socket::INET->new( - LocalAddr => $server::ip, - LocalPort => 67, - Proto => "udp", - Broadcast => 1, - PeerAddr => '255.255.255.255', - PeerPort => 68, - Reuse => 1, - ) or die "socket: $@"; + if ( ip::in_dhcp_range( $ip ) ) { + my $buff = $packet->serialize(); - my $buff = $packet->serialize(); - $reply->send( $buff, 0 ) or die "Error sending: $!\n"; + my $reply = IO::Socket::INET->new( + LocalAddr => $server::ip, + LocalPort => 67, + Proto => "udp", + Broadcast => 1, +# PeerAddr => '255.255.255.255', + 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"; + } else { + $audit->{error} = "$ip our of our range $server::ip $server::netmask"; + warn $audit->{error}; + } + + CouchDB::audit( @type, $audit ); # system("arp -s $ip $mac"), @@ -229,7 +250,10 @@ print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n"; + CouchDB::audit( 'start', { addr => $sock->sockhost, port => $sock->sockport } ); + while (1) { + server->refresh; process_packet $sock; } }