From 777945a60acab67f71f4ab693d2b56eabd9237bd Mon Sep 17 00:00:00 2001 From: "Evan.Lai" Date: Thu, 2 Mar 2023 21:13:10 +0800 Subject: [PATCH 1/2] fix: socket_buffer_size exponent operator --- nfstream/streamer.py | 2 +- tests.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nfstream/streamer.py b/nfstream/streamer.py index 3e663e1..354a736 100644 --- a/nfstream/streamer.py +++ b/nfstream/streamer.py @@ -179,7 +179,7 @@ class NFStreamer(object): @socket_buffer_size.setter def socket_buffer_size(self, value): - if not isinstance(value, int) or (isinstance(value, int) and (value < 0 or value > 2^31-1)): + if not isinstance(value, int) or (isinstance(value, int) and (value < 0 or value > 2**31-1)): raise ValueError("Please specify a valid socket_buffer_size parameter (positive integer <= 2^31-1).") self._socket_buffer_size = value diff --git a/tests.py b/tests.py index 53b4618..00c9119 100644 --- a/tests.py +++ b/tests.py @@ -102,7 +102,7 @@ class NFStreamTest(object): def test_socket_buffer_size_parameter(): print("\n----------------------------------------------------------------------") n_exceptions = 0 - socket_buffer_size = ["largest", -1, 2^31] + socket_buffer_size = ["largest", -1, 2**31] for x in socket_buffer_size: try: NFStreamer(source=os.path.join("tests", "pcaps", "google_ssl.pcap"), socket_buffer_size=x) From 0ca653524cbd9e4d9136916b96921c22f90cf284 Mon Sep 17 00:00:00 2001 From: "Evan.Lai" Date: Thu, 2 Mar 2023 21:21:42 +0800 Subject: [PATCH 2/2] fix: remove unnecessary isinstance check --- nfstream/streamer.py | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/nfstream/streamer.py b/nfstream/streamer.py index 354a736..85eaf72 100644 --- a/nfstream/streamer.py +++ b/nfstream/streamer.py @@ -169,7 +169,7 @@ class NFStreamer(object): @snapshot_length.setter def snapshot_length(self, value): - if not isinstance(value, int) or (isinstance(value, int) and value <= 0): + if not isinstance(value, int) or value <= 0: raise ValueError("Please specify a valid snapshot_length parameter (positive integer).") self._snapshot_length = value @@ -179,7 +179,7 @@ class NFStreamer(object): @socket_buffer_size.setter def socket_buffer_size(self, value): - if not isinstance(value, int) or (isinstance(value, int) and (value < 0 or value > 2**31-1)): + if not isinstance(value, int) or (value < 0 or value > 2**31-1): raise ValueError("Please specify a valid socket_buffer_size parameter (positive integer <= 2^31-1).") self._socket_buffer_size = value @@ -189,8 +189,7 @@ class NFStreamer(object): @idle_timeout.setter def idle_timeout(self, value): - if not isinstance(value, int) or (isinstance(value, int) and - ((value < 0) or (value * 1000) > 18446744073709551615)): # max uint64_t + if not isinstance(value, int) or ((value < 0) or (value * 1000) > 18446744073709551615): # max uint64_t raise ValueError("Please specify a valid idle_timeout parameter (positive integer in seconds).") self._idle_timeout = value @@ -200,8 +199,7 @@ class NFStreamer(object): @active_timeout.setter def active_timeout(self, value): - if not isinstance(value, int) or (isinstance(value, int) and - ((value < 0) or (value * 1000) > 18446744073709551615)): # max uint64_t + if not isinstance(value, int) or ((value < 0) or (value * 1000) > 18446744073709551615): # max uint64_t raise ValueError("Please specify a valid active_timeout parameter (positive integer in seconds).") self._active_timeout = value @@ -211,7 +209,7 @@ class NFStreamer(object): @accounting_mode.setter def accounting_mode(self, value): - if not isinstance(value, int) or (isinstance(value, int) and value not in [0, 1, 2, 3]): + if not isinstance(value, int) or (value not in [0, 1, 2, 3]): raise ValueError("Please specify a valid accounting_mode parameter (possible values: 0, 1, 2, 3).") self._accounting_mode = value @@ -244,7 +242,7 @@ class NFStreamer(object): @n_dissections.setter def n_dissections(self, value): - if not isinstance(value, int) or (isinstance(value, int) and (value < 0 or value > 255)): + if not isinstance(value, int) or (value < 0 or value > 255): raise ValueError("Please specify a valid n_dissections parameter (possible values in : [0,...,255]).") self._n_dissections = value @@ -264,7 +262,7 @@ class NFStreamer(object): @splt_analysis.setter def splt_analysis(self, value): - if not isinstance(value, int) or (isinstance(value, int) and (value < 0 or value > 255)): + if not isinstance(value, int) or (value < 0 or value > 255): raise ValueError("Please specify a valid splt_analysis parameter (possible values in : [0,...,255])") self._splt_analysis = value