diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/circuit.c | 6 | ||||
| -rw-r--r-- | epan/circuit.h | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-isdn.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-x25.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/epan/circuit.c b/epan/circuit.c index 4ea8fab477..9bdc76e2f3 100644 --- a/epan/circuit.c +++ b/epan/circuit.c @@ -293,7 +293,7 @@ circuit_get_dissector(circuit_t *circuit) */ gboolean try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame, - tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) + tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data) { circuit_t *circuit; @@ -302,8 +302,8 @@ try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame, if (circuit != NULL) { if (circuit->dissector_handle == NULL) return FALSE; - call_dissector(circuit->dissector_handle, tvb, pinfo, - tree); + call_dissector_with_data(circuit->dissector_handle, tvb, pinfo, + tree, data); return TRUE; } return FALSE; diff --git a/epan/circuit.h b/epan/circuit.h index 2cb8757b43..0541f6dfa1 100644 --- a/epan/circuit.h +++ b/epan/circuit.h @@ -99,7 +99,7 @@ extern dissector_handle_t circuit_get_dissector(circuit_t *circuit); */ extern gboolean try_circuit_dissector(circuit_type ctype, guint32 circuit_id, guint32 frame, - tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree); + tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data); #ifdef __cplusplus } diff --git a/epan/dissectors/packet-isdn.c b/epan/dissectors/packet-isdn.c index e3350ce145..458a675fc3 100644 --- a/epan/dissectors/packet-isdn.c +++ b/epan/dissectors/packet-isdn.c @@ -197,7 +197,7 @@ dissect_isdn(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } if (!try_circuit_dissector(pinfo->ctype, pinfo->circuit_id, - pinfo->fd->num, tvb, pinfo, tree)) + pinfo->fd->num, tvb, pinfo, tree, NULL)) call_dissector(data_handle, tvb, pinfo, tree); } diff --git a/epan/dissectors/packet-x25.c b/epan/dissectors/packet-x25.c index 6c15c9ce63..662ea531ba 100644 --- a/epan/dissectors/packet-x25.c +++ b/epan/dissectors/packet-x25.c @@ -2025,7 +2025,7 @@ dissect_x25_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, /* See if there's already a dissector for this circuit. */ if (try_circuit_dissector(CT_X25, vc, pinfo->fd->num, next_tvb, pinfo, - tree)) { + tree, NULL)) { pinfo->private_data = saved_private_data; return; /* found it and dissected it */ } |