Changeset 198 for trunk/klask

Timestamp:

Jan 25, 2017, 11:04:43 AM (7 years ago)

Author:

g7moreau

Message:

• Remove training space

File:

• trunk/klask (modified) (18 diffs)

trunk/klask

@@ -22 +22 @@
 
 # apt-get install snmp fping libnet-cidr-lite-perl libnet-netmask-perl libnet-snmp-perl libnetaddr-ip-perl libyaml-perl
-# libcrypt-des-perl libcrypt-hcesha-perl libdigest-hmac-perl 
+# libcrypt-des-perl libcrypt-hcesha-perl libdigest-hmac-perl
 # arping net-tools fping bind9-host arpwatch
 
@@ -651 +651 @@
    if ($sw_model eq 'HP2424M') {
       if ($sw_port > 24) {
-         
+
          my $reste = $sw_port - 24;
          return "A$reste";
@@ -659 +659 @@
    if ($sw_model eq 'HP1600M') {
       if ($sw_port > 16) {
-         
+
          my $reste = $sw_port - 16;
          return "A$reste";
@@ -667 +667 @@
    if ($sw_model eq 'HP2810-48G' or $sw_model eq 'HP2810-24G') {
       if ($sw_port > 48) {
-         
+
          my $reste = $sw_port - 48;
          return "Trk$reste";
@@ -675 +675 @@
    if ($sw_model eq 'HP3500-24G') {
       if ($sw_port > 289) {
-         
+
          my $reste = $sw_port - 289;
          return "Trk$reste";
@@ -750 +750 @@
 sub snmp_get_swithport_hr {
    my ($snmp_session, $swport) = @_;
-   
+
    my $research_index = $OID_NUMBER{ifIndex} .'.'. $swport;
    my $result_index = $snmp_session->get_request(
@@ -775 +775 @@
 
       next LOOP_ON_IP_ADDRESS if exists $computerdb->{$ip}{switch_port_hr} and defined $computerdb->{$ip}{switch_port_hr};
-      
+
       $computerdb->{$ip}{switch_port_hr} = $computerdb->{$ip}{switch_port};
       }
@@ -912 +912 @@
       for my $ip (keys %{$computerdb}) {
          next LOOP_ON_COMPUTER if $mac ne $computerdb->{$ip}{mac_address};
- 
+
          my ($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst) = localtime $computerdb->{$ip}{timestamp};
          $year += 1900;
@@ -1176 +1176 @@
 
       my @ip_list   = shuffle get_list_ip($vlan);
-      
+
       LOOP_ON_IP_ADDRESS:
       for my $ip (@ip_list) {
@@ -1182 +1182 @@
          next LOOP_ON_IP_ADDRESS if
             not exists $computerdb->{$ip};
-            
+
             #&& $computerdb->{$ip}{timestamp} > $timestamp_barrier;
          my $ip_timestamp   = $computerdb->{$ip}{timestamp};
@@ -1194 +1194 @@
             hostname_fq => $ip_hostname_fq,
             };
-         
+
          if (
             ( $mactimedb{$ip_mac}->{timestamp} - $ip_timestamp > $timestamp_barrier
@@ -1578 +1578 @@
       $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/;
-      
+
       if ($ip_timestamp_mod > $ip_timestamp_ref) {
          $swithportdb{$swpt} = {
@@ -1602 +1602 @@
          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;
-         
+
          $src_ip = $ip;
          $src_timestamp = $computerdb->{$ip}{timestamp};
@@ -1901 +1901 @@
          if (exists $computerdb->{$ip}) {
             next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{timestamp} > $timestamp_barrier;
-            
+
             my $mac_address = $computerdb->{$ip}{mac_address};
             LOOP_ON_DATABASE:
@@ -1938 +1938 @@
 sub cmd_ip_free_txt {
    my %result_ip = @_;
-   
+
    printf "%-15s %-40s %-16s %s\n", qw(IPv4-Address Hostname-FQ Date VLAN);
    print "-------------------------------------------------------------------------------\n";
@@ -2152 +2152 @@
 
    ALL_SWITCH:
-   for my $one_computer (@list_all_switch) {
-      my %resol_arp = resolve_ip_arp_host($one_computer, q{*}, q{low}); # arp resolution
-      print "Info: switch loop $one_computer\n" if $verbose;
+   for my $one_switch (@list_all_switch) {
+      my %resol_arp = resolve_ip_arp_host($one_switch, q{*}, q{low}); # arp resolution
+      print "Info: switch loop $one_switch\n" if $verbose;
       next ALL_SWITCH if $resol_arp{mac_address} eq 'unknow';
 
@@ -2164 +2164 @@
 
       if ($verbose) {
-         print "VERBOSE_3: $one_computer $resol_arp{ipv4_address} $resol_arp{mac_address}\n";
-         print "VERBOSE_3: $one_computer --- ",
+         print "VERBOSE_3: $one_switch $resol_arp{ipv4_address} $resol_arp{mac_address}\n";
+         print "VERBOSE_3: $one_switch --- ",
             join(' + ', keys %{$where{$resol_arp{ipv4_address}}}),
             "\n";
@@ -2173 +2173 @@
       print "VERBOSE_4: db_switch_ip_hostnamefq $resol_arp{ipv4_address} -> $resol_arp{hostname_fq}\n" if $verbose;
 
-      $SWITCH_DB{$one_computer}->{ipv4_address} = $resol_arp{ipv4_address};
-      $SWITCH_DB{$one_computer}->{mac_address}  = $resol_arp{mac_address};
-      $SWITCH_DB{$one_computer}->{timestamp}    = $timestamp;
+      $SWITCH_DB{$one_switch}->{ipv4_address} = $resol_arp{ipv4_address};
+      $SWITCH_DB{$one_switch}->{mac_address}  = $resol_arp{mac_address};
+      $SWITCH_DB{$one_switch}->{timestamp}    = $timestamp;
       }