Changeset 211

Timestamp:

Feb 16, 2017, 9:51:57 PM (8 years ago)

Author:

g7moreau

Message:

• Update doc and error swith -> switch

File:

• trunk/klask (modified) (12 diffs)

trunk/klask

@@ -7 +7 @@
 use strict;
 use warnings;
-use version; our $VERSION = qv('0.5.9');
+use version; our $VERSION = qv('0.6.0');
 
 use Readonly;
@@ -490 +490 @@
 
       my $swport_num = $result->{$research1};
-      my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_swithport_hr($session, $swport_num));
+      my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
 
       $session->close;
@@ -544 +544 @@
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport_num = $result->{$research1};
-         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_swithport_hr($session, $swport_num));
+         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
 
          SWITCH_PORT_IGNORE:
@@ -757 +757 @@
    }
 
-sub snmp_get_swithport_hr {
+sub snmp_get_switchport_hr {
    my ($snmp_session, $swport) = @_;
 
@@ -1559 +1559 @@
 
    # create a database with the most recent computer by switch port
-   my %swithportdb = ();
+   my %switchportdb = ();
    LOOP_ON_IP_ADDRESS:
    for my $ip (keys %{$computerdb}) {
@@ -1574 +1574 @@
          $computerdb->{$ip}{switch_hostname} || $computerdb->{$ip}{switch_description},
          $computerdb->{$ip}{switch_port_hr};
-      $swithportdb{$swpt} ||= {
+      $switchportdb{$swpt} ||= {
          ip          => $ip,
          timestamp   => $ip_timestamp,
@@ -1584 +1584 @@
       # if float computer, set date 15 day before warning...
       my $ip_timestamp_mod = $ip_timestamp;
-      my $ip_timestamp_ref = $swithportdb{$swpt}->{timestamp};
+      my $ip_timestamp_ref = $switchportdb{$swpt}->{timestamp};
       $ip_timestamp_mod -= 15 * 24 * 3600 if $ip_hostname_fq =~ m/$RE_FLOAT_HOSTNAME/;
-      $ip_timestamp_ref -= 15 * 24 * 3600 if $swithportdb{$swpt}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/;
+      $ip_timestamp_ref -= 15 * 24 * 3600 if $switchportdb{$swpt}->{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/;
 
       if ($ip_timestamp_mod > $ip_timestamp_ref) {
-         $swithportdb{$swpt} = {
+         $switchportdb{$swpt} = {
             ip          => $ip,
             timestamp   => $ip_timestamp,
@@ -1600 +1600 @@
 
    LOOP_ON_RECENT_COMPUTER:
-   for my $swpt (keys %swithportdb) {
+   for my $swpt (keys %switchportdb) {
       next LOOP_ON_RECENT_COMPUTER if $swpt =~ m/^\s*0$/;
-      next LOOP_ON_RECENT_COMPUTER if $swithportdb{$swpt}->{hostname_fq} !~ m/$RE_FLOAT_HOSTNAME/;
-
-      my $src_ip = $swithportdb{$swpt}->{ip};
+      next LOOP_ON_RECENT_COMPUTER if $switchportdb{$swpt}->{hostname_fq} !~ m/$RE_FLOAT_HOSTNAME/;
+
+      my $src_ip = $switchportdb{$swpt}->{ip};
       my $src_timestamp = 0;
       LOOP_ON_IP_ADDRESS:
       for my $ip (keys %{$computerdb}) {
-         next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{mac_address} ne  $swithportdb{$swpt}->{mac_address};
+         next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{mac_address} ne  $switchportdb{$swpt}->{mac_address};
          next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{hostname_fq} =~ m/$RE_FLOAT_HOSTNAME/;
          next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{timestamp} < $src_timestamp;
@@ -1618 +1618 @@
       # keep only if float computer is the most recent
       next LOOP_ON_RECENT_COMPUTER if $src_timestamp == 0;
-      next LOOP_ON_RECENT_COMPUTER if $swithportdb{$swpt}->{timestamp} < $src_timestamp;
-
-      my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $swithportdb{$swpt}->{timestamp};
+      next LOOP_ON_RECENT_COMPUTER if $switchportdb{$swpt}->{timestamp} < $src_timestamp;
+
+      my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $switchportdb{$swpt}->{timestamp};
       $year += 1900;
       $mon++;
@@ -1633 +1633 @@
 
       printf "%s / %-10s +-> %-10s(%i)  %s %s %s %s\n",
-         $swpt, $swithportdb{$swpt}->{vlan}, $computerdb->{$src_ip}{network}, $vlan_id,
+         $swpt, $switchportdb{$swpt}->{vlan}, $computerdb->{$src_ip}{network}, $vlan_id,
          $date,
          $src_date,
@@ -2130 +2130 @@
       if (defined $result and $result->{$research1} ne 'noSuchInstance') {
          my $swport_num = $result->{$research1};
-         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_swithport_hr($session, $swport_num));
+         my $swport_hr = get_human_readable_port($sw->{model}, snmp_get_switchport_hr($session, $swport_num));
          print "Klask find MAC $mac_address on switch $sw_name port $swport_hr\n";
          }
@@ -2545 +2545 @@
  klask enable  switch port
  klask disable switch port
- klask status  swith port
+ klask status  switch port