Changeset 179

Timestamp:

Aug 25, 2016, 11:51:49 AM (8 years ago)

Author:

g7moreau

Message:

• Add scan-mode parameter active/passive

File:

• trunk/klask (modified) (9 diffs)

trunk/klask

@@ -530 +530 @@
    }
 
+sub get_current_scan_mode {
+   my $vlan_name = shift;
+
+   return $KLASK_CFG->{network}{$vlan_name}{'scan-mode'} || $DEFAULT{'scan-mode'} || 'active';
+   }
+
 sub get_current_vlan_name_for_interface {
    my $interface = shift;
@@ -939 +945 @@
 
    ALL_NETWORK:
-   for my $net (@network) {
-
-      my @computer = get_list_ip($net);
-      my $current_interface = get_current_interface($net);
-
-      fast_ping(@computer);
+   for my $current_net (@network) {
+
+      my @computer = get_list_ip($current_net);
+      my $current_interface = get_current_interface($current_net);
+
+      fast_ping(@computer) if get_current_scan_mode($current_net) eq 'active';
 
       LOOP_ON_COMPUTER:
@@ -968 +974 @@
          # do not search on router connection (why ?)
          if ( exists $router_mac_ip{$resol_arp{mac_address}}) {
-            $computer_not_detected{$one_computer} = $current_interface;
+            $computer_not_detected{$one_computer} = $current_net;
             next LOOP_ON_COMPUTER;
             }
@@ -974 +980 @@
          # do not search on switch inter-connection
          if (exists $switch_level{$resol_arp{hostname_fq}}) {
-            $computer_not_detected{$one_computer} = $current_interface;
+            $computer_not_detected{$one_computer} = $current_net;
             next LOOP_ON_COMPUTER;
             }
@@ -985 +991 @@
          # do not have a mac address
          if ($resol_arp{mac_address} eq 'unknow' or (exists $resol_arp{timestamps} and $resol_arp{timestamps} < ($timestamp - 3 * 3600))) {
-            $computer_not_detected{$one_computer} = $current_interface;
+            $computer_not_detected{$one_computer} = $current_net;
             next LOOP_ON_COMPUTER;
             }
@@ -1017 +1023 @@
                switch_port_hr     => $where{switch_port_hr},
                timestamp          => $timestamp,
-               network            => $net,
+               network            => $current_net,
                };
             next LOOP_ON_COMPUTER;
@@ -1033 +1039 @@
                switch_port_hr     => $where{switch_port_hr},
                timestamp          => $resol_arp{timestamp},
-               network            => $net,
+               network            => $current_net,
                };
             }
@@ -1045 +1051 @@
          # relance un arping sur la machine si celle-ci n'a pas été détectée depuis plus d'une semaine
 #         push @computer_not_detected, $resol_arp{ipv4_address} if $computerdb->{$resol_arp{ipv4_address}}{timestamp} < $timestamp_last_week;
-         $computer_not_detected{$resol_arp{ipv4_address}} = $current_interface if $computerdb->{$resol_arp{ipv4_address}}{timestamp} < $timestamp_last_week;
+         $computer_not_detected{$resol_arp{ipv4_address}} = $current_net if $computerdb->{$resol_arp{ipv4_address}}{timestamp} < $timestamp_last_week;
 
          }
@@ -1059 +1065 @@
 
    for my $one_computer (keys %computer_not_detected) {
-      my $interface = $computer_not_detected{$one_computer};
-      system "arping -c 1 -w 1 -rR -i $interface $one_computer &>/dev/null";
-#      print  "arping -c 1 -w 1 -rR -i $interface $one_computer 2>/dev/null\n";
+      my $current_net = $computer_not_detected{$one_computer};
+      my $current_interface = get_current_interface($current_net);
+      system "arping -c 1 -w 1 -rR -i $current_interface $one_computer &>/dev/null" if get_current_scan_mode($current_net) eq 'active';
+#      print  "arping -c 1 -w 1 -rR -i $current_interface $one_computer 2>/dev/null\n";
       }
    return;