show all clients in server dhcp range by default
authorDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 21 Jul 2010 18:29:33 +0000 (18:29 +0000)
committerDobrica Pavlinusic <dpavlin@rot13.org>
Wed, 21 Jul 2010 18:29:33 +0000 (18:29 +0000)
lib/PXElator/httpd.pm

index 8786b9f..4e29397 100644 (file)
@@ -418,7 +418,9 @@ warn "XXX pids = ", dump( $daemons::pids );
                                my $mac = delete $conf->{mac} || '';
                                my $dev = $arp->{$mac};
 
                                my $mac = delete $conf->{mac} || '';
                                my $dev = $arp->{$mac};
 
-                               next unless $dev || $param->{all};
+                               my $in_dhcp_range = ip::in_dhcp_range($ip);
+
+                               next unless $dev || $param->{all} || $in_dhcp_range;
 
                                my $style
                                        = 'style="color:'
 
                                my $style
                                        = 'style="color:'
@@ -428,7 +430,7 @@ warn "XXX pids = ", dump( $daemons::pids );
 
                                $style ||= '';
                                my $ip_text = qq|<tt>$ip</tt>|;
 
                                $style ||= '';
                                my $ip_text = qq|<tt>$ip</tt>|;
-                               $ip_text = qq|<tt><b>$ip</b></tt>| if ip::in_dhcp_range($ip);
+                               $ip_text = qq|<tt><b>$ip</b></tt>| if $in_dhcp_range;
 
                                $dev = qq|<tt>$dev</tt>| if $dev;
 
 
                                $dev = qq|<tt>$dev</tt>| if $dev;