From f225f3ba5cab5b58d53eb738dfab6a532a1ff795 Mon Sep 17 00:00:00 2001
From: Thomas <thomas.filiol1_ext@michelin.com>
Date: Mon, 26 Oct 2020 11:07:33 +0100
Subject: [PATCH 1/2] add hardware id on ipdiscover

assets in ipdiscover linked to the machine that discovers them
---
 .../Server/Capacities/Ipdiscover.pm           | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm b/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
index 13b2b510..bdc8b7b9 100644
--- a/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
+++ b/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
@@ -278,30 +278,30 @@ sub _ipdiscover_read_result{
         my $row_verif = $request_verif->fetchrow_hashref;
 
         if (defined $row_verif->{'TAG'}) {
-          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=? WHERE MAC=? AND TAG=?');
-          $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $_->{M}, $tag);
+          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=? WHERE MAC=? AND TAG=?');
+          $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $DeviceID, $_->{M}, $tag);
         } else {
-          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=?, TAG=? WHERE MAC=?');
-          $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $tag, $_->{M});
+          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=?, TAG=? WHERE MAC=?');
+          $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $DeviceID, $tag, $_->{M});
         }
         unless($update_req->rows){
-          $insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME, TAG) VALUES(?,?,?,?,?,?)');
-          $insert_req->execute($_->{I}, $_->{M}, $mask, $subnet, $_->{N}, $tag);
+          $insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME, TAG, HARDWARE_ID) VALUES(?,?,?,?,?,?,?)');
+          $insert_req->execute($_->{I}, $_->{M}, $mask, $subnet, $_->{N}, $tag, $DeviceID);
         }
       }
     } else {
       # We insert the results (MAC/IP)
-      $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=? WHERE MAC=?');
-      $insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME) VALUES(?,?,?,?,?)');
+      $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=? WHERE MAC=?');
+      $insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME, HARDWARE_ID) VALUES(?,?,?,?,?,?)');
 
       for(@$base){
         unless($_->{I}=~/^(\d{1,3}(?:\.\d{1,3}){3})$/ and $_->{M}=~/.{2}(?::.{2}){5}/){
           &_log(1003,'ipdiscover','bad_result') if $ENV{'OCS_OPT_LOGLEVEL'};
           next;
         }
-        $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $_->{M});
+        $update_req->execute($_->{I}, $mask, $subnet, $_->{N},$DeviceID, $_->{M});
         unless($update_req->rows){
-          $insert_req->execute($_->{I}, $_->{M}, $mask, $subnet, $_->{N});
+          $insert_req->execute($_->{I}, $_->{M}, $mask, $subnet, $_->{N},$DeviceID);
         }
       }
     }

From 72c1b13767862c8daaec904af5524fd7fe1abb55 Mon Sep 17 00:00:00 2001
From: Lea9250 <lea.droguet@factorfx.com>
Date: Tue, 5 Oct 2021 08:18:34 +0000
Subject: [PATCH 2/2] add datetime of scans

---
 Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm b/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
index 8883ca94..f239e7c9 100644
--- a/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
+++ b/Apache/Ocsinventory/Server/Capacities/Ipdiscover.pm
@@ -280,10 +280,10 @@ sub _ipdiscover_read_result{
         my $row_verif = $request_verif->fetchrow_hashref;
 
         if (defined $row_verif->{'TAG'}) {
-          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=? WHERE MAC=? AND TAG=?');
+          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=?, HARDWARE_ID=? WHERE MAC=? AND TAG=?');
           $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $DeviceID, $_->{M}, $tag);
         } else {
-          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=?, TAG=? WHERE MAC=?');
+          $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=?, HARDWARE_ID=?, TAG=? WHERE MAC=?');
           $update_req->execute($_->{I}, $mask, $subnet, $_->{N}, $DeviceID, $tag, $_->{M});
         }
         unless($update_req->rows){
@@ -293,7 +293,7 @@ sub _ipdiscover_read_result{
       }
     } else {
       # We insert the results (MAC/IP)
-      $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NULL, NAME=?, HARDWARE_ID=? WHERE MAC=?');
+      $update_req = $dbh->prepare('UPDATE netmap SET IP=?,MASK=?,NETID=?,DATE=NOW(), NAME=?, HARDWARE_ID=? WHERE MAC=?');
       $insert_req = $dbh->prepare('INSERT INTO netmap(IP, MAC, MASK, NETID, NAME, HARDWARE_ID) VALUES(?,?,?,?,?,?)');
 
       for(@$base){