--- lib/PXElator/httpd.pm 2009/08/27 12:42:53 303
+++ lib/PXElator/httpd.pm 2009/08/28 12:34:10 319
@@ -26,6 +26,7 @@
server
brctl
ip
+nmap
client
@@ -54,6 +55,7 @@
use ip;
use wireshark;
use syslogd;
+use nmap;
use CouchDB;
@@ -213,10 +215,11 @@
$ip = $new_ip;
}
- my $ip_short = (split(/\./, $ip, 4))[3];
+ my $netmask = ip::to_int $server::netmask;
+ my $network = ip::to_int $server::ip & $netmask;
+ my $ip_int = ip::to_int $ip;
- # if ( $ip ne $server::ip ) -- not flexible enough for tunnel endpoints
- if ( $ip_short >= $server::ip_from && $ip_short <= $server::ip_to ) {
+ if ( $ip ne $server::ip && $ip_int >= ( $network | $server::ip_from ) && $ip_int <= ( $network | $server::ip_to ) ) {
my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} );
my @table = (
@@ -232,7 +235,9 @@
'mac' => format::mac( $mac => 'html' ),
'deploy' => html::select( 'deploy', $deploy, config::available )
);
- $deploy = qq|
PXElinux
| . html::pre( config::for_ip( $ip ) );
+ if ( my $pxelinux = config::for_ip( $ip ) ) {
+ $deploy = qq|PXElinux
| . html::pre( $pxelinux );
+ }
}
print $client ok
@@ -251,6 +256,7 @@
map {
my @c = split(/\s+/,$_);
if ( $#c == 5 ) {
+ client::save_ip_mac( $c[0], $c[3] );
( uc $c[3] => [ $c[0] , $c[5] ] )
} else {
}
@@ -261,31 +267,27 @@
print $client ok
, qq|Clients on $server::ip
|
- , html::table( -5,
- 'ip', 'mac', 'hostname', 'deploy', 'arp',
+ , html::table( -6,
+ 'ip', 'mac', 'arp', 'hostname', 'deploy', 'conf',
map {
my $ip = $_;
- $ip =~ s{^.+/ip/}{};
- my $mac = client::mac_from_ip $ip;
- my $arp = $arp->{ $mac };
- $arp = $arp ? $arp->[1] : '';
- $arp =~ s{$ip}{};
+ my $conf = client::all_conf( $ip );
+ my $mac = delete $conf->{mac} || '';
(
- qq|$ip|
+ qq|$ip|
, format::mac( $mac => 'html' )
- , client::conf( $ip, 'hostname' )
- , html::tt( client::conf( $ip, 'deploy' ) )
- , $arp
+ , ( $arp->{$mac} ? $arp->{$mac}->[1] : '' )
+ , delete $conf->{hostname}
+ , delete $conf->{deploy}
+ , ( %$conf ? html::pre_dump( $conf ) : qq|nmap| )
);
}
- glob("$server::conf/ip/*")
- )
- , qq|ARP
|
- , html::table( -3, 'ip', 'mac', 'dev',
+ sort { ip::to_int($a) cmp ip::to_int($b) }
map {
- my $c = $arp->{$_};
- ( $c->[0], format::mac( $_ => 'html' ), $c->[1] )
- } sort keys %$arp
+ my $ip = $_;
+ $ip =~ s{^.+/ip/}{};
+ $ip;
+ } glob("$server::conf/ip/*")
)
;
}
@@ -298,6 +300,18 @@
, join("\n", map { qq|$_| } ( qw/link addr route neigh ntable tunnel maddr mroute xfrm/ ))
, ip::html( $1 )
;
+ } elsif ( $path =~ m{^/nmap} ) {
+ if ( my $scan = $param->{scan} ) {
+ nmap::scan( $scan );
+ print $client redirect("$url/client#$scan");
+ } else {
+ print $client ok, qq|
+
+ |;
+ }
} elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) {
eval 'our $' . $1 . ' = ' . $2;
warn $@ if $@;