Skip to content

Fixed incompatibility with new version of PyShark or tshark #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed incompatibility with new version of PyShark or tshark #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions polymorph/tgenerator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,25 @@ def _traverse_fields(self, all_fields):
newfield = self._traverse_fields(all_fields[f])
parse_fields = self._update(parse_fields, newfield)
elif type(raw_f[-1]) is list:
for subf in range(len(raw_f)):
newfield = self._traverse_fields({f + "_raw": raw_f[subf],
f: all_fields[f][subf]})
# check for new data format
if len(all_fields[f]) != len(raw_f):
newfield = self._traverse_fields({f + "_raw": [raw_f[0],
raw_f[1], raw_f[2], raw_f[3],
raw_f[4]], f: all_fields[f][0]})
parse_fields = self._update(parse_fields, newfield)

for subf in range(1, len(all_fields[f])):
newfield = self._traverse_fields({f + "_raw": raw_f[subf+4],
f: all_fields[f][subf]})
parse_fields = self._update(parse_fields, newfield)

else:
#use old format
for subf in range(len(raw_f)):
newfield = self._traverse_fields({f + "_raw": raw_f[subf],
f: all_fields[f][subf]})
parse_fields = self._update(parse_fields, newfield)

else:
print("[ERROR] Parsing field:", f)
# Return the parsed fields without duplicates
Expand Down