diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-24 21:59:51 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-25 13:15:11 +0000 |
| commit | dcfea6a06ddf7adeafc8613efe74310251201789 (patch) | |
| tree | 04c70020bc89a90670634230a5be0560af7c9c3e /epan/dissectors/packet-ipmi-trace.c | |
| parent | 479ab3bcdc8d79b27bfc99fcde073457f72126ac (diff) | |
create_dissector_handle -> new_create_dissector_handle
This finalizes the transformation for dissectors.
Change-Id: Ie5986b72bb69a6e8779ca3f5e20a80357c9e6fea
Reviewed-on: https://code.wireshark.org/review/12122
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-ipmi-trace.c')
| -rw-r--r-- | epan/dissectors/packet-ipmi-trace.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ipmi-trace.c b/epan/dissectors/packet-ipmi-trace.c index 7ae312e27d..2a2fcb378e 100644 --- a/epan/dissectors/packet-ipmi-trace.c +++ b/epan/dissectors/packet-ipmi-trace.c @@ -275,8 +275,8 @@ dissect_ipmb_state_notify(tvbuff_t * tvb, proto_tree * tree) bits_chn_state_info, ENC_LITTLE_ENDIAN); } -static void -dissect_ipmi_trace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ipmi_trace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint block_type, chn_num, data_type, tmp; tvbuff_t * next_tvb; @@ -284,7 +284,7 @@ dissect_ipmi_trace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_captured_length(tvb) < 11) { /* TODO: add expert info */ call_dissector(data_dissector_handle, tvb, pinfo, tree); - return; + return tvb_captured_length(tvb); } /* get first byte */ @@ -421,6 +421,7 @@ dissect_ipmi_trace(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { call_dissector(data_dissector_handle, next_tvb, pinfo, tree); } + return tvb_captured_length(tvb); } void @@ -448,7 +449,7 @@ proto_reg_handoff_ipmi_trace(void) { dissector_handle_t ipmi_trace_handle; - ipmi_trace_handle = create_dissector_handle(dissect_ipmi_trace, + ipmi_trace_handle = new_create_dissector_handle(dissect_ipmi_trace, proto_ipmi_trace); data_dissector_handle = find_dissector("data"); |