Changeset 310 for trunk

Timestamp:

Oct 19, 2017, 10:00:46 PM (7 years ago)

Author:

g7moreau

Message:

• Protect key portignore help ip match

File:

• trunk/klask (modified) (8 diffs)

trunk/klask

@@ -208 +208 @@
 else {
    print {*STDERR} "klask: command $cmd not found\n\n";
-   $CMD_DB{help}->();
+   $CMD_DB{'help'}->();
    exit 1;
    }
@@ -354 +354 @@
 
    for my $sw_kind (keys %SWITCH_KIND) {
-      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/ms; # option xms break search, why ?
+      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{'match'}/ms; # option xms break search, why ?
 
       return $SWITCH_KIND{$sw_kind}->{'model'};
@@ -369 +369 @@
 
    for my $sw_kind (keys %SWITCH_KIND) {
-      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{match}/ms; # option xms break search, why ?
+      next if not $sw_snmp_description =~ m/$SWITCH_KIND{$sw_kind}->{'match'}/ms; # option xms break search, why ?
       last if not exists $SWITCH_KIND{$sw_kind}->{'revision'};
 
@@ -556 +556 @@
       # 21->24 45->48
       SWITCH_PORT_IGNORE:
-      for my $portignore (@{$sw->{portignore}}) {
+      for my $portignore (@{$sw->{'portignore'}}) {
          next LOOP_ON_SWITCH if $swport_hr eq $portignore;
          my ($swport_hr_limited) = split /$SEP_AGGREGATOR_PORT/, $swport_hr; # Beginning of the swith port (Aggregator)
@@ -604 +604 @@
 
          SWITCH_PORT_IGNORE:
-         for my $portignore (@{$sw->{portignore}}) {
+         for my $portignore (@{$sw->{'portignore'}}) {
             if ($swport_hr eq $portignore) {
                $session->close;
@@ -1341 +1341 @@
       }
    for my $sw (@SWITCH_LIST) {
-      push @{$sw->{portignore}}, $db_switch_output_port{$sw->{'hostname'}}  if exists $db_switch_output_port{$sw->{'hostname'}};
+      push @{$sw->{'portignore'}}, $db_switch_output_port{$sw->{'hostname'}}  if exists $db_switch_output_port{$sw->{'hostname'}};
       if ( exists $db_switch_chained_port{$sw->{'hostname'}} ) {
          chop $db_switch_chained_port{$sw->{'hostname'}};
-         push @{$sw->{portignore}}, split m/ : /xms, $db_switch_chained_port{$sw->{'hostname'}};
-         }
-#      print "$sw->{'hostname'} ++ @{$sw->{portignore}}\n";
+         push @{$sw->{'portignore'}}, split m/ : /xms, $db_switch_chained_port{$sw->{'hostname'}};
+         }
+#      print "$sw->{'hostname'} ++ @{$sw->{'portignore'}}\n";
       }
    }
@@ -1590 +1590 @@
                or $mactimedb{$ip_mac}->{'hostname_fq'} =~ m/$RE_FLOAT_HOSTNAME/
                )) {
-            print "remove ip ".$mactimedb{$ip_mac}->{ip}."\n" if $verbose;
-            delete $computerdb->{$mactimedb{$ip_mac}->{ip}};
+            print "remove ip ".$mactimedb{$ip_mac}->{'ip'}."\n" if $verbose;
+            delete $computerdb->{$mactimedb{$ip_mac}->{'ip'}};
             $database_has_changed++;
             }
@@ -2046 +2046 @@
       next LOOP_ON_RECENT_COMPUTER if $switchportdb{$swpt}->{'hostname_fq'} !~ m/$RE_FLOAT_HOSTNAME/;
 
-      my $src_ip = $switchportdb{$swpt}->{ip};
+      my $src_ip = $switchportdb{$swpt}->{'ip'};
       my $src_timestamp = 0;
       LOOP_ON_IP_ADDRESS: