aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-dvbci.c
diff options
context:
space:
mode:
Diffstat (limited to 'epan/dissectors/packet-dvbci.c')
-rw-r--r--epan/dissectors/packet-dvbci.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-dvbci.c b/epan/dissectors/packet-dvbci.c
index ec984da..9389e43 100644
--- a/epan/dissectors/packet-dvbci.c
+++ b/epan/dissectors/packet-dvbci.c
@@ -3892,8 +3892,8 @@ dissect_dvbci_payload_lsc(guint32 tag, gint len_field,
msg_tvb = tvb_new_subset_remaining(tvb, offset);
if (!msg_tvb)
break;
- if (dvbci_dissect_lsc_msg && circuit && circuit->dissector_handle) {
- msg_handle = circuit->dissector_handle;
+ if (dvbci_dissect_lsc_msg && circuit_get_dissector(circuit)) {
+ msg_handle = circuit_get_dissector(circuit);
col_append_str(pinfo->cinfo, COL_INFO, ", ");
col_set_fence(pinfo->cinfo, COL_INFO);
col_append_str(pinfo->cinfo, COL_PROTOCOL, ", ");
@@ -4133,8 +4133,9 @@ dissect_dvbci_payload_sas(guint32 tag, gint len_field _U_,
tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
msg_tvb = tvb_new_subset_length(tvb, offset, msg_len);
- msg_handle = (circuit && circuit->dissector_handle) ?
- circuit->dissector_handle : data_handle;
+ msg_handle = circuit_get_dissector(circuit);
+ if (msg_handle == NULL)
+ msg_handle = data_handle;
call_dissector(msg_handle, msg_tvb, pinfo, tree);
break;
default: