osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

dvb-ci: clean up the protocol column for mime files 

Some DVB-CI messages contain a file that can be dissected by the mime-encap
dissector. mime-encap adds itself to the protocol column. We already set a
fence, but things still look messy:

DVB-CIMIME_FILE

This patch adds ", " before the fence and "Data" afterwards. If mime-encap
is enabled, it'll overwrite the Data with its protocol name

DVB-CI, MIME_FILE

If mime-encap is disabled, the embedded file will be handled by the data
dissector, who doesn't touch the protocol column. So we keep

DVB-CI, Data
This commit is contained in:
Martin Kaiser 2021-02-25 22:06:21 +01:00
parent eceff254b6
commit 12edf427ab
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
epan/dissectors/packet-dvbci.c
View File

@ -3701,7 +3701,10 @@ dissect_dvbci_ami_file_ack(tvbuff_t *tvb, gint offset,
tvb, offset, 4, ENC_BIG_ENDIAN);
offset += 4;
if (file_data_len > 0) {
col_append_str(pinfo->cinfo, COL_PROTOCOL, ", ");
col_set_fence(pinfo->cinfo, COL_PROTOCOL);
/* The mime_encap dissector may overwrite this part. */
col_append_str(pinfo->cinfo, COL_PROTOCOL, "Data");
col_set_fence(pinfo->cinfo, COL_INFO);
call_dissector(mime_handle,
tvb_new_subset_length(tvb, offset, file_data_len),