laforge has submitted this change. (
https://gerrit.osmocom.org/c/pysim/+/41712?usp=email )
Change subject: pyshark_gsmtap: Adjust display filter for some wireshark
versions
......................................................................
pyshark_gsmtap: Adjust display filter for some wireshark versions
On my debian unstable system with wireshark 4.6.2-3, the pyshark_gsmtap
APDU source misses to report any ATRs, as those are not part of what's
reported with the 'gsm_sim' display filter. This is due to
wireshark.git commit bcd82e2370d18e20983b378d494964d89c191cef first part
of the 4.6.0 release, which splits the ATR dissection into a separate
sub-dissector.
We cannot use the seemingly logical 'gsmtap.type == 4' instead, as old
wireshark simply bypasses any output for the gsmtap header if the SIM
sub-dissector is used.
Hence, 'gsm_sim || iso7816.atr' is something compatible with older and
newer wireshark versions.
Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86
---
M pySim/apdu_source/pyshark_gsmtap.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
laforge: Looks good to me, approved
Jenkins Builder: Verified
fixeria: Looks good to me, but someone else must approve
diff --git a/pySim/apdu_source/pyshark_gsmtap.py
b/pySim/apdu_source/pyshark_gsmtap.py
index e8f5d18..13562d9 100644
--- a/pySim/apdu_source/pyshark_gsmtap.py
+++ b/pySim/apdu_source/pyshark_gsmtap.py
@@ -84,5 +84,5 @@
Args:
pcap_filename: File name of the pcap file to be opened
"""
- pyshark_inst = pyshark.FileCapture(pcap_filename,
display_filter='gsm_sim', use_json=True, keep_packets=False)
+ pyshark_inst = pyshark.FileCapture(pcap_filename,
display_filter='gsm_sim || iso7816.atr', use_json=True, keep_packets=False)
super().__init__(pyshark_inst)
--
To view, visit https://gerrit.osmocom.org/c/pysim/+/41712?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pysim
Gerrit-Branch: master
Gerrit-Change-Id: I53c1c8ed58a82c37cd4be4af3890af21da839e86
Gerrit-Change-Number: 41712
Gerrit-PatchSet: 2
Gerrit-Owner: laforge <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-CC: dexter <[email protected]>
