--- lib/PXElator/dhcpd.pm	2009/09/09 14:27:02	413
+++ lib/PXElator/dhcpd.pm	2010/01/02 17:20:40	457
@@ -62,7 +62,7 @@
 	} else {
 		$ip = $request_ip;
 		client::save_ip_mac( $ip, $mac );
-		warn "W: $ip our of server range $server::ip $server::netmask\n";
+		warn "W: $ip out of server range $server::ip/$server::netmask\n";
 	}
 
 	return $ip;
@@ -79,8 +79,6 @@
 sub process_packet {
 	my $sock = shift;
 
-	server->refresh;
-
 	my $buf;
 	$sock->recv($buf, 1024);
 	my $size = 'empty';
@@ -123,6 +121,8 @@
 
 	config::for_ip( $ip );
 
+	my $server = server::as_hash_for $ip;
+
 	my $packet = {
 		Op		=> BOOTREPLY(),
 		Hops	=> $dhcp->hops(),
@@ -130,21 +130,21 @@
 		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() => '',
 	};
 
@@ -176,28 +176,34 @@
 
 	my $messagetype = $dhcp->getOptionValue(DHO_DHCP_MESSAGE_TYPE());
 
+	my @type;
+
 	if ($messagetype eq DHCPDISCOVER()) {
-		$audit->{type} = '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());
-		$audit->{type} = 'request';
+		@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()) {
-		$audit->{type} = 'inform';
+		@type = qw( inform ignored );
 	} else {
-		$audit->{type} = sprintf('ignored %x', $messagetype);
+		@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 );
@@ -207,22 +213,24 @@
 		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 => '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";
+		$audit->{error} = "$ip not in server range $server::ip $server::netmask - no packet sent";
 		warn $audit->{error};
 	}
 
-	CouchDB::audit( $audit->{type}, $audit );
+	CouchDB::audit( @type, $audit );
 
 #	system("arp -s $ip $mac"),
 
@@ -247,6 +255,7 @@
 	CouchDB::audit( 'start', { addr => $sock->sockhost, port => $sock->sockport } );
 
 	while (1) {
+		server->refresh;
 		process_packet $sock;
 	}
 }