Changeset 181 for trunk/klask

Timestamp:

Aug 26, 2016, 2:19:12 PM (8 years ago)

Author:

g7moreau

Message:

• limit infinite loop in updatesw to 100 if no good solution
• return human readable port on search-mac-on-switch

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -499 +499 @@
          my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_swithport_hr($session, $swport_num));
 
+         SWITCH_PORT_IGNORE:
+         for my $portignore (@{$sw->{portignore}}) {
+            if ($swport_hr eq $portignore) {
+               $session->close;
+               next LOOP_ON_ALL_SWITCH
+               }
+            }
+
          $ret->{$sw->{hostname}} = {};
          $ret->{$sw->{hostname}}{hostname}    = $sw->{hostname};
@@ -2017 +2025 @@
 
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
-         my $swport = $result->{$research1};
-         print "Klask find MAC $mac_address on switch $sw_name port $swport\n";
+         my $swport_num = $result->{$research1};
+         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_swithport_hr($session, $swport_num));
+         print "Klask find MAC $mac_address on switch $sw_name port $swport_hr\n";
          }
       else {
@@ -2138 +2147 @@
    my %db_switch_connected_on_port = ();
    my $maybe_more_than_one_switch_connected = 'yes';
-
-   while ($maybe_more_than_one_switch_connected eq 'yes') {
+   my $cloop = 0;
+
+   while ($maybe_more_than_one_switch_connected eq 'yes' and $cloop < 100) {
+      $cloop++;
+      print "VERBOSE_9: cloop reduction step: $cloop\n" if $verbose;
       for my $sw (keys %db_switch_link_with) {
          for my $connect (keys %{$db_switch_link_with{$sw}}) {
@@ -2161 +2173 @@
          my ($sw_connect,$port_connect) = split m/ : /xms, $swport;
          my @sw_on_same_port = keys %{$db_switch_connected_on_port{$swport}};
+         print "VERBOSE_10: $swport -- ".$#sw_on_same_port." -- @sw_on_same_port\n" if $verbose;
 
          CONNECTED: