From 432bba54836cbd23296d40edc66ff9186efbd083 Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 09:39:33 +0300 Subject: [PATCH 1/6] Add test for packets over 1514 bytes --- tests/marine/test_marine.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/marine/test_marine.py b/tests/marine/test_marine.py index 1e5fd87..a038d07 100644 --- a/tests/marine/test_marine.py +++ b/tests/marine/test_marine.py @@ -1025,3 +1025,6 @@ def test_parse_fields_preserves_order(marine_instance: Marine, tcp_packet: bytes "udp.srcport": None, "tcp.srcport": "16424", } + +def test_filter_packet_larger_than_1514(marine_instance: Marine): + assert marine_instance.filter(b'a' * 2500, display_filter='frame contains a') From e265bf366b99e736d768b6c286dc33e5d6b3456b Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 09:48:59 +0300 Subject: [PATCH 2/6] Fix test --- tests/marine/test_marine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/marine/test_marine.py b/tests/marine/test_marine.py index a038d07..6544dfd 100644 --- a/tests/marine/test_marine.py +++ b/tests/marine/test_marine.py @@ -1027,4 +1027,4 @@ def test_parse_fields_preserves_order(marine_instance: Marine, tcp_packet: bytes } def test_filter_packet_larger_than_1514(marine_instance: Marine): - assert marine_instance.filter(b'a' * 2500, display_filter='frame contains a') + assert not marine_instance.filter(b'a' * 2500, display_filter='frame contains test') From fc8d4e87e98f63ac78a8c5e98242c425d899c063 Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 09:59:35 +0300 Subject: [PATCH 3/6] Black fix --- tests/marine/test_marine.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/marine/test_marine.py b/tests/marine/test_marine.py index 6544dfd..409d1c9 100644 --- a/tests/marine/test_marine.py +++ b/tests/marine/test_marine.py @@ -1026,5 +1026,6 @@ def test_parse_fields_preserves_order(marine_instance: Marine, tcp_packet: bytes "tcp.srcport": "16424", } + def test_filter_packet_larger_than_1514(marine_instance: Marine): assert not marine_instance.filter(b'a' * 2500, display_filter='frame contains test') From 0ffd5138fa1cbb46f12a52552ae7156121bc6c7d Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 10:03:22 +0300 Subject: [PATCH 4/6] Fix set env --- marine/marine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marine/marine.py b/marine/marine.py index 236fec0..d3af902 100644 --- a/marine/marine.py +++ b/marine/marine.py @@ -50,7 +50,7 @@ class Marine: def __init__(self, epan_auto_reset_count: Optional[int] = None): if not os.getenv("WIRESHARK_DATA_DIR"): - os.putenv("WIRESHARK_DATA_DIR", str(MARINE_DATA_DIR)) + os.environ["WIRESHARK_DATA_DIR"] = str(MARINE_DATA_DIR)) try: cdll.LoadLibrary(MARINE_NAME) except Exception: From 588dfb85eae76213829113c5bd4b71e9863bcae3 Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 10:06:03 +0300 Subject: [PATCH 5/6] Fix black --- tests/marine/test_marine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/marine/test_marine.py b/tests/marine/test_marine.py index 409d1c9..635fe78 100644 --- a/tests/marine/test_marine.py +++ b/tests/marine/test_marine.py @@ -1028,4 +1028,4 @@ def test_parse_fields_preserves_order(marine_instance: Marine, tcp_packet: bytes def test_filter_packet_larger_than_1514(marine_instance: Marine): - assert not marine_instance.filter(b'a' * 2500, display_filter='frame contains test') + assert not marine_instance.filter(b"a" * 2500, display_filter="frame contains test") From c621ce185a557d2fccece2ca1affc87df6d9cac2 Mon Sep 17 00:00:00 2001 From: danig55 <46000722+danielg55@users.noreply.github.com> Date: Tue, 6 Apr 2021 10:11:47 +0300 Subject: [PATCH 6/6] Fix --- marine/marine.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/marine/marine.py b/marine/marine.py index d3af902..6f7ef4d 100644 --- a/marine/marine.py +++ b/marine/marine.py @@ -50,7 +50,7 @@ class Marine: def __init__(self, epan_auto_reset_count: Optional[int] = None): if not os.getenv("WIRESHARK_DATA_DIR"): - os.environ["WIRESHARK_DATA_DIR"] = str(MARINE_DATA_DIR)) + os.environ["WIRESHARK_DATA_DIR"] = str(MARINE_DATA_DIR) try: cdll.LoadLibrary(MARINE_NAME) except Exception: