BOSWatch/BW3-Core
1
0
Fork 0
mirror of https://github.com/BOSWatch/BW3-Core.git synced 2025-12-06 07:12:04 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

edit descriptor module

Browse source
This commit is contained in:
Bastian Schroll 2019-10-27 21:58:06 +01:00
parent 0d81c35092
commit d0876ca404
No known key found for this signature in database
GPG key ID: 0AE96912A20E9F5F
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boswatch/packet.py
View file

@ -43,7 +43,7 @@ class Packet:
@param fieldName: Name of the data to set @param fieldName: Name of the data to set
@param value: Value to set""" @param value: Value to set"""
self._packet[fieldName] = value self._packet[fieldName] = str(value)
def get(self, fieldName): def get(self, fieldName):
"""!Returns the value from a single field. """!Returns the value from a single field.
@ -52,7 +52,7 @@ class Packet:
@param fieldName: Name of the field @param fieldName: Name of the field
@return Value or None""" @return Value or None"""
try: try:
return self._packet[fieldName] return str(self._packet[fieldName])
except: except:
logging.warning("field not found: %s", fieldName) logging.warning("field not found: %s", fieldName)
return None return None

6
module/descriptor.py
View file

@ -46,9 +46,9 @@ class BoswatchModule(Module):
if not bwPacket.get(descriptor.get("scanField")): if not bwPacket.get(descriptor.get("scanField")):
break # scanField is not available in this packet break # scanField is not available in this packet
bwPacket.set(descriptor.get("descrField"), description.get("for")) bwPacket.set(descriptor.get("descrField"), description.get("for"))
if str(description.get("for")) == str(bwPacket.get(descriptor.get("scanField"))): if str(description.get("for")) == bwPacket.get(descriptor.get("scanField")):
logging.debug("Description '%s' added in packet field '%s'", description.get("add"), logging.debug("Description '%s' added in packet field '%s'",
descriptor.get("descrField")) description.get("add"), descriptor.get("descrField"))
bwPacket.set(descriptor.get("descrField"), description.get("add")) bwPacket.set(descriptor.get("descrField"), description.get("add"))
break # this descriptor has found a description - run next descriptor break # this descriptor has found a description - run next descriptor
return bwPacket return bwPacket