From 38318cc10abf11a4559cc7c1ee3a3ac58fdce2e4 Mon Sep 17 00:00:00 2001 From: Omer Doron Date: Sun, 12 Jul 2020 15:23:53 +0300 Subject: [PATCH 1/3] Handle marine loaded already --- marine/marine.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/marine/marine.py b/marine/marine.py index c04ccff..dc5cd2f 100644 --- a/marine/marine.py +++ b/marine/marine.py @@ -6,6 +6,8 @@ from . import encap_consts +MARINE_ALREADY_INITIALIZED_ERROR_CODE = -2 + class MarineResult(Structure): _fields_ = [("output", c_char_p), ("result", c_int)] @@ -30,6 +32,8 @@ def __init__(self, lib_path: str, epan_auto_reset_count: Optional[int] = None): self._marine.marine_free.argtypes = [MARINE_RESULT_POINTER] return_code = self._marine.init_marine() if return_code < 0: + if return_code == MARINE_ALREADY_INITIALIZED_ERROR_CODE: + raise RuntimeError("Marine is already initialized") raise RuntimeError("Could not initialize Marine") if epan_auto_reset_count: From 4eba4ee7bf168ecf104495c6599ddaa72cb2b36b Mon Sep 17 00:00:00 2001 From: Omer Doron Date: Mon, 13 Jul 2020 15:13:47 +0300 Subject: [PATCH 2/3] Use marine-core const --- marine/marine.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/marine/marine.py b/marine/marine.py index dc5cd2f..13685d8 100644 --- a/marine/marine.py +++ b/marine/marine.py @@ -6,8 +6,6 @@ from . import encap_consts -MARINE_ALREADY_INITIALIZED_ERROR_CODE = -2 - class MarineResult(Structure): _fields_ = [("output", c_char_p), ("result", c_int)] @@ -32,7 +30,7 @@ def __init__(self, lib_path: str, epan_auto_reset_count: Optional[int] = None): self._marine.marine_free.argtypes = [MARINE_RESULT_POINTER] return_code = self._marine.init_marine() if return_code < 0: - if return_code == MARINE_ALREADY_INITIALIZED_ERROR_CODE: + if return_code == c_int.in_dll(self._marine, 'MARINE_ALREADY_INITIALIZED_ERROR_CODE').value: raise RuntimeError("Marine is already initialized") raise RuntimeError("Could not initialize Marine") From cacbaf1c9f3399695392751ef2d26ceb42705f9b Mon Sep 17 00:00:00 2001 From: Omer Doron Date: Tue, 14 Jul 2020 12:47:08 +0300 Subject: [PATCH 3/3] Run Black on code --- marine/marine.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/marine/marine.py b/marine/marine.py index 13685d8..4af77fb 100644 --- a/marine/marine.py +++ b/marine/marine.py @@ -30,7 +30,12 @@ def __init__(self, lib_path: str, epan_auto_reset_count: Optional[int] = None): self._marine.marine_free.argtypes = [MARINE_RESULT_POINTER] return_code = self._marine.init_marine() if return_code < 0: - if return_code == c_int.in_dll(self._marine, 'MARINE_ALREADY_INITIALIZED_ERROR_CODE').value: + if ( + return_code + == c_int.in_dll( + self._marine, "MARINE_ALREADY_INITIALIZED_ERROR_CODE" + ).value + ): raise RuntimeError("Marine is already initialized") raise RuntimeError("Could not initialize Marine")