Fix #3880: AutomotiveTestCaseExecutor on 32-bit machines (#3887)

* Fix #3880

* apply suggestions

---------

Co-authored-by: Nils Weiss <[email protected]>

Author: polybassa

scapy/contrib/automotive/scanner/enumerator.py

@@ -288,7 +288,7 @@ def execute(self, socket, state, **kwargs):
 
         # log_automotive.debug("[i] Using iterator %s in state %s", it, state)
 
-        start_time = time.time()
+        start_time = time.monotonic()
         log_automotive.debug(
             "Start execution of enumerator: %s", time.ctime(start_time))
 
@@ -309,7 +309,7 @@ def execute(self, socket, state, **kwargs):
                         "Finished execution count of enumerator")
                     return
 
-            if (start_time + execution_time) < time.time():
+            if (start_time + execution_time) < time.monotonic():
                 log_automotive.debug(
                     "[i] Finished execution time of enumerator: %s",
                     time.ctime())

scapy/contrib/automotive/scanner/executor.py

@@ -184,7 +184,7 @@ def execute_test_case(self, test_case, kill_time=None):
             test_case_kwargs = dict()
 
         if kill_time:
-            max_execution_time = max(int(kill_time - time.time()), 5)
+            max_execution_time = max(int(kill_time - time.monotonic()), 5)
             cur_execution_time = test_case_kwargs.get("execution_time", 1200)
             test_case_kwargs["execution_time"] = min(max_execution_time,
                                                      cur_execution_time)
@@ -258,16 +258,19 @@ def scan(self, timeout=None):
         :return: None
         """
         self.configuration.stop_event.clear()
-        kill_time = time.time() + (timeout or 0xffffffff)
+        if timeout is None:
+            kill_time = None
+        else:
+            kill_time = time.monotonic() + timeout
         log_automotive.debug("Set kill_time to %s" % time.ctime(kill_time))
-        while kill_time > time.time():
+        while kill_time is None or kill_time > time.monotonic():
             test_case_executed = False
             log_automotive.info("[i] Scan progress %0.2f", self.progress())
             log_automotive.debug("[i] Scan paths %s", self.state_paths)
             for p, test_case in product(
                     self.state_paths, self.configuration.test_cases):
                 log_automotive.info("Scan path %s", p)
-                terminate = kill_time <= time.time()
+                terminate = kill_time and kill_time <= time.monotonic()
                 if terminate or self.configuration.stop_event.is_set():
                     log_automotive.debug(
                         "Execution time exceeded. Terminating scan!")