Changeset 9

Timestamp:

Jan 30, 2008, 6:15:15 PM (16 years ago)

Author:

g7moreau

Message:

• Do not hardcode any more the router IP address Need to be test now before closing the ticket

File:

• trunk/klask (modified) (5 diffs)

trunk/klask

@@ -404 +404 @@
    }
 
+# liste l'ensemble des routeurs du réseau
+sub get_list_main_router {
+   my @network = @_;
+
+   my @res = ();
+
+   for my $net (@network) {
+      push @res, $switchdb->{network}{$net}{'main-router'};
+      }
+
+   return @res;
+   }
+
 sub get_human_readable_port {
    my $sw = shift;
@@ -512 +525 @@
    my %router_mac_ip = ();
    DETECT_ALL_ROUTER:
-   for my $one_router ('194.254.66.254') {
+#   for my $one_router ('194.254.66.254') {
+   for my $one_router ( get_list_main_router(@network) ) {
       my %resol_arp = resolve_ip_arp_host($one_router);
       $router_mac_ip{ $resol_arp{mac_address} } = $resol_arp{ipv4_address};
@@ -547 +561 @@
          my %resol_arp = resolve_ip_arp_host($one_computer,$current_interface);
          
-         # do not search router connection
+         # do not search on router connection (why ?)
          if ( exists $router_mac_ip{$resol_arp{mac_address}}) {
             $computer_not_detected{$one_computer} = $current_interface;
@@ -553 +567 @@
             }
 
-         # do not search switch connection
+         # do not search on switch inter-connection
          if (exists $switch_level{$resol_arp{hostname_fq}}) {
             $computer_not_detected{$one_computer} = $current_interface;
@@ -752 +766 @@
 
    DETECT_ALL_ROUTER:
-   for my $one_computer ('194.254.66.254') {
+#   for my $one_computer ('194.254.66.254') {
+   for my $one_computer ( get_list_main_router(get_list_network()) ) {
       my %resol_arp = resolve_ip_arp_host($one_computer,'*','low');            #resolution arp
       next DETECT_ALL_ROUTER if $resol_arp{mac_address} eq 'unknow';