Wireshark-commits: [Wireshark-commits] master cc4bce5: ftsanity.py: make it work with modern tshark
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cc4bce537bdd92ec10c0bf26432f3bb2396ac4a6
Submitter: Anders Broman (a.broman58@xxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
cc4bce5 by Peter Wu (peter@xxxxxxxxxxxxx):
ftsanity.py: make it work with modern tshark
Broken since 4ac2441d7c7371249a3422fc2e67b8ad98aa6631 ("Coalesce "-G
fields2" and "-G fields3" into "-G fields").
This patch fixes Python3 compatibility, fixes handling of the changed
output and option and prints the faulting line on assertion error. It
also updates two dissectors which had tabs in their description,
breaking the output.
Tested with Python 2.5.6, 2.6.6, 2.7.9, 3.2.6, 3.4.3.
Change-Id: Ifcd0d0eb092b357eca357cd53f2e1348ebf8885c
Reviewed-on: https://code.wireshark.org/review/7791
Reviewed-by: Gilbert Ramirez <gram@xxxxxxxxxxxxxxx>
Reviewed-by: Anders Broman <a.broman58@xxxxxxxxx>
Actions performed:
from 693304b checklicenses.py: add python3 compatibility
adds cc4bce5 ftsanity.py: make it work with modern tshark
Summary of changes:
asn1/atn-ulcs/packet-atn-ulcs-template.c | 12 ++++-----
epan/dissectors/packet-atn-ulcs.c | 14 +++++------
epan/dissectors/packet-ceph.c | 2 +-
tools/ftsanity.py | 40 ++++++++++++++----------------
4 files changed, 30 insertions(+), 38 deletions(-)