--- lib/PXElator/dhcpd.pm	2009/08/06 21:31:10	168
+++ lib/PXElator/dhcpd.pm	2009/08/19 17:01:20	267
@@ -23,6 +23,9 @@
 use Net::DHCP::Packet;
 use Net::DHCP::Constants 0.67;
 
+use CouchDB;
+use format;
+
 use server;
 my $debug = server::debug;
 
@@ -36,33 +39,31 @@
 
 use client;
 
-sub client_ip {
-	my ( $mac ) = @_;
+sub client_mac_ip {
+	my ( $mac, $request_ip ) = @_;
+
+	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";
 		return $ip;
+	} elsif ( in_our_range( $request_ip ) ) {
+		$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 $ip = client::next_ip;
-
-	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;
 }
 
@@ -74,6 +75,17 @@
 our $file;
 our $transaction = 0; # FIXME predictible transaction numbers
 
+sub ip2bin { pack('C*', split(/\./, $_[0])) };
+sub in_our_range {
+	my $ip = shift;
+	return 1 if $ip eq '0.0.0.0';
+	return 1 if (
+		( ip2bin($ip)         & ip2bin($server::netmask) )
+		eq
+		( ip2bin($server::ip) & ip2bin($server::netmask) )
+	);
+}
+
 sub process_packet {
 	my $sock = shift;
 
@@ -88,12 +100,24 @@
 	return unless $buf;
 
 	my $dhcp = Net::DHCP::Packet->new($buf);
-	$dhcp->comment( $transaction++ );
 
 	warn "recv: ", $dhcp->toString if $debug;
 
+	$dhcp->comment( $transaction++ );
+
 	my $mac = substr($dhcp->chaddr(),0,$dhcp->hlen()*2);
-	my $ip = client_ip($mac);
+	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";
+
+	my $audit = { mac => format::mac($mac), ip => $ip, hostname => $hostname,
+		options => {
+			map {
+				( $_ => $dhcp->getOptionValue( $_ ) )
+			} @{ $dhcp->{options_order} }
+		},
+	};
 
 =for later
 
@@ -147,6 +171,8 @@
 	}
 
 	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;
@@ -161,12 +187,12 @@
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
 	if ($messagetype eq DHCPDISCOVER()) {
-		log::mac $mac, "DHCP DISCOVER";
+		$audit->{type} = 'discover';
 		$packet->{Comment} = $dhcp->comment();
 		$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 $file";
+		$audit->{type} = 'request';
 		if ( $ip eq $requested_ip ) {
 			$packet->{DHO_DHCP_MESSAGE_TYPE()}      = DHCPACK();
 			$packet->{DHO_DHCP_LEASE_TIME()}        = 5 * 60; # 5 min
@@ -176,28 +202,36 @@
 			$packet->{DHO_DHCP_MESSAGE()} = "Bad request, expected $ip";
 		}
 	} elsif ($messagetype eq DHCPINFORM()) {
-		log::mac $mac, "DHCP INFORM ignored";
+		$audit->{type} = 'inform';
 	} else {
-		log::mac $mac, "$messagetype igored (bootp?)";
+		$audit->{type} = sprintf('ignored %x', $messagetype);
 	}
 
 	warn ">> $mac == $ip server: $server::ip", $file ? " file: $file\n" : "\n" if $debug;
+	$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 ( in_our_range( $ip ) ) {
+		my $buff = $packet->serialize();
+
+		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: $@";
+
+		$reply->send( $buff, 0 ) or die "Error sending: $!\n";
+	} else {
+		$audit->{error} = "$ip our of our range $server::ip $server::netmask";
+	}
 
-	my $buff = $packet->serialize();
-	$reply->send( $buff, 0 ) or die "Error sending: $!\n";
+	CouchDB::audit( $audit->{type}, $audit );
 
 #	system("arp -s $ip $mac"),
 
@@ -219,6 +253,8 @@
 
 	print "DHCP listen on ",$sock->sockhost,":",$sock->sockport,"\n";
 
+	CouchDB::audit( 'start', { addr => $sock->sockhost, port => $sock->sockport } );
+
 	while (1) {
 		process_packet $sock;
 	}