From 940075ed85d0c6cff2beffd206a031041046e791 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Tue, 14 Apr 2020 22:34:17 +0200 Subject: [PATCH 1/3] Add Fix for descriptor --- module/descriptor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/descriptor.py b/module/descriptor.py index 77a28f8..f14f153 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,10 +42,10 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: + bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): if not bwPacket.get(descriptor.get("scanField")): break # scanField is not available in this packet - bwPacket.set(descriptor.get("descrField"), description.get("for")) if str(description.get("for")) == bwPacket.get(descriptor.get("scanField")): logging.debug("Description '%s' added in packet field '%s'", description.get("add"), descriptor.get("descrField")) From bfa9b0b3ceec08871c2cf3dfe9a9a241209aebc2 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Sat, 18 Apr 2020 14:09:59 +0200 Subject: [PATCH 2/3] return bwpacket if scanField is None --- module/descriptor.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/descriptor.py b/module/descriptor.py index f14f153..b470c83 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,6 +42,8 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: + if bwPacket.get(descriptor.get("scanField")) is None: + return bwPacket bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): if not bwPacket.get(descriptor.get("scanField")): From fde99396b8cdc1a742aaa4bd61f0c7d98e0046e2 Mon Sep 17 00:00:00 2001 From: Jan Speller Date: Sat, 18 Apr 2020 14:14:56 +0200 Subject: [PATCH 3/3] fix error --- module/descriptor.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/module/descriptor.py b/module/descriptor.py index b470c83..cf17530 100644 --- a/module/descriptor.py +++ b/module/descriptor.py @@ -42,12 +42,10 @@ class BoswatchModule(ModuleBase): @param bwPacket: A BOSWatch packet instance""" for descriptor in self.config: - if bwPacket.get(descriptor.get("scanField")) is None: - return bwPacket + if not bwPacket.get(descriptor.get("scanField")): + break # scanField is not available in this packet bwPacket.set(descriptor.get("descrField"), bwPacket.get(descriptor.get("scanField"))) for description in descriptor.get("descriptions"): - if not bwPacket.get(descriptor.get("scanField")): - break # scanField is not available in this packet if str(description.get("for")) == bwPacket.get(descriptor.get("scanField")): logging.debug("Description '%s' added in packet field '%s'", description.get("add"), descriptor.get("descrField"))