Changeset 135

Timestamp:

Nov 5, 2013, 11:07:36 AM (11 years ago)

Author:

g7moreau

Message:

• More severe criteria for ip-free

File:

• trunk/klask (modified) (2 diffs)

trunk/klask

@@ -1549 +1549 @@
       for my $ip (@ip_list) {
 
-         next LOOP_ON_IP_ADDRESS if
-            exists $computerdb->{$ip}
-            && $computerdb->{$ip}{timestamp} > $timestamp_barrier;
+         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:
+            foreach my $ip_db (keys %{$computerdb}) {
+               next LOOP_ON_DATABASE if $computerdb->{$ip_db}{mac_address} ne $mac_address;
+               next LOOP_ON_IP_ADDRESS if $computerdb->{$ip_db}{timestamp} > $timestamp_barrier;
+               }
+            }
 
          my $ip_date_last_detection = '';
@@ -1561 +1568 @@
             }
 
-         $result_ip{$ip} ||= {};
-         $result_ip{$ip}->{date_last_detection} = $ip_date_last_detection;
-
          my $packed_ip = scalar gethostbyname($ip);
          my $hostname_fq = 'unknown';
             $hostname_fq = scalar gethostbyaddr($packed_ip, AF_INET) || 'unknown' if defined $packed_ip;
+
+         next LOOP_ON_IP_ADDRESS if $hostname_fq =~ m/$RE_FLOAT_HOSTNAME/;
+
+         $result_ip{$ip} ||= {};
+         $result_ip{$ip}->{date_last_detection} = $ip_date_last_detection;
          $result_ip{$ip}->{hostname_fq} = $hostname_fq;
-
          $result_ip{$ip}->{vlan} = $vlan;