From: Joe Guo <joeg@catalyst.net.nz>
Date: Thu, 10 May 2018 05:01:19 +0000 (+1200)
Subject: traffic: simplify forget_packets_outside_window
X-Git-Tag: ldb-1.4.0~296
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5107e56aa089b51f8d00049b63b2c79ea9e495cc;p=thirdparty%2Fsamba.git

traffic: simplify forget_packets_outside_window

Make code compact, and improve performance a little bit.

Signed-off-by: Joe Guo <joeg@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
---

diff --git a/python/samba/emulate/traffic.py b/python/samba/emulate/traffic.py
index d65aec6f32c..95ab3c9d380 100644
--- a/python/samba/emulate/traffic.py
+++ b/python/samba/emulate/traffic.py
@@ -948,18 +948,8 @@ class Conversation(object):
         :param s: start of the window
         :param e: end of the window
         """
-
-        new_packets = []
-        for p in self.packets:
-            if p.timestamp < s or p.timestamp > e:
-                continue
-            new_packets.append(p)
-
-        self.packets = new_packets
-        if new_packets:
-            self.start_time = new_packets[0].timestamp
-        else:
-            self.start_time = None
+        self.packets = [p for p in self.packets if s <= p.timestamp <= e]
+        self.start_time = self.packets[0].timestamp if self.packets else None
 
     def renormalise_times(self, start_time):
         """Adjust the packet start times relative to the new start time."""