- Timestamp:
- Mar 11, 2017, 10:56:58 PM (7 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/klask
r232 r233 1380 1380 my $computerdb = computerdb_load(); 1381 1381 1382 printf "%-28s %8s %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN);1382 printf "%-28s %8s %-40s %-15s %-18s %-16s %s\n", qw(Switch Port Hostname-FQ IPv4-Address MAC-Address Date VLAN); 1383 1383 print "--------------------------------------------------------------------------------------------------------------------------------------------\n"; 1384 1384 … … 1386 1386 for my $ip (Net::Netmask::sort_by_ip_address(keys %{$computerdb})) { 1387 1387 1388 # next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq 'unknow';1389 1390 1388 # to be improve in the future 1391 1389 next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} eq ($computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}); # switch on himself ! 1392 1393 # dans le futur1394 # next if $computerdb->{$ip}{hostname_fq} eq 'unknow';1395 1390 1396 1391 my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $computerdb->{$ip}{timestamp}; … … 1402 1397 $vlan = $computerdb->{$ip}{network}.'('.get_current_vlan_id($computerdb->{$ip}{network}).')' if $computerdb->{$ip}{network}; 1403 1398 1404 my $arrow ='<------- ';1405 $arrow ='<======= ' if $computerdb->{$ip}{switch_port_hr} =~ m/^(Trk|Br|Po)/;1406 1407 printf "%-28s %8s %8s%-40s %-15s %-18s %-16s %s\n",1399 my $arrow ='<-----------'; 1400 $arrow ='<===========' if $computerdb->{$ip}{switch_port_hr} =~ m/^(Trk|Br|Po)/; 1401 1402 printf "%-28s %8s %12s %-40s %-15s %-18s %-16s %s\n", 1408 1403 $computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description}, 1409 1404 $computerdb->{$ip}{switch_port_hr}, … … 2526 2521 print "---------------------------------------------\n"; 2527 2522 for my $sw (sort keys %db_switch_output_port) { 2528 my $arrow =' +-->';2529 $arrow =' +==>' if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/;2523 my $arrow ='-->'; 2524 $arrow ='==>' if $db_switch_output_port{$sw} =~ m/^(Trk|Br|Po)/; 2530 2525 if (exists $db_switch_parent{$sw}) { 2531 printf "%-28s %8s %4s %8s%-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{'switch'};2526 printf "%-28s %8s %3s %-8s %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, $db_switch_parent{$sw}->{port_hr}, $db_switch_parent{$sw}->{'switch'}; 2532 2527 } 2533 2528 else { 2534 printf "%-28s %8s %4s %8s%-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, '', 'router';2529 printf "%-28s %8s %3s %-8s %-25s\n", $sw, $db_switch_output_port{$sw}, $arrow, '', 'router'; 2535 2530 } 2536 2531 } … … 2542 2537 my ($sw_connect,$port_connect) = split m/ : /xms, $swport; 2543 2538 for my $sw (keys %{$db_switch_connected_on_port{$swport}}) { 2544 my $arrow ='<-- +';2545 $arrow ='<== +' if $port_connect =~ m/^(Trk|Br|Po)/;2539 my $arrow ='<--'; 2540 $arrow ='<==' if $port_connect =~ m/^(Trk|Br|Po)/; 2546 2541 if (exists $db_switch_output_port{$sw}) { 2547 printf "%-28s %8s %4s %8s%-25s\n", $sw_connect, $port_connect, $arrow, $db_switch_output_port{$sw}, $sw;2542 printf "%-28s %8s %3s %-8s %-25s\n", $sw_connect, $port_connect, $arrow, $db_switch_output_port{$sw}, $sw; 2548 2543 } 2549 2544 else { 2550 printf "%-28s %8s %4s %8s%-25s\n", $sw_connect, $port_connect, $arrow, '', $sw;2545 printf "%-28s %8s %3s %-8s %-25s\n", $sw_connect, $port_connect, $arrow, '', $sw; 2551 2546 } 2552 2547 }
Note: See TracChangeset
for help on using the changeset viewer.