diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-17 20:16:06 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-11-18 07:33:08 +0000 |
| commit | 4adeb424f5cdb74ca1f98cd4b87bd72e4d811f03 (patch) | |
| tree | 6c73d6e0795cc5181ad53242581e4c7f2282081f /epan/dissectors/packet-pdc.c | |
| parent | 13297438d98e3388d650fc55c2a77d5b52367e1f (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: I9c7d1c092bbae896ec0c2832617891346927f2e1
Reviewed-on: https://code.wireshark.org/review/11932
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-pdc.c')
| -rw-r--r-- | epan/dissectors/packet-pdc.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/epan/dissectors/packet-pdc.c b/epan/dissectors/packet-pdc.c index 3b8df6db84..f8b1911720 100644 --- a/epan/dissectors/packet-pdc.c +++ b/epan/dissectors/packet-pdc.c @@ -436,7 +436,7 @@ static guint get_pdc_message_len(packet_info *pinfo _U_, tvbuff_t *tvb, /* top level call to recombine split tcp packets */ -static void tcp_dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int tcp_dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { guint8 mpdu_type; guint8 minimum_bytes; @@ -470,6 +470,7 @@ static void tcp_dissect_pdc(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } tcp_dissect_pdus(tvb, pinfo, tree, TRUE, minimum_bytes, get_pdc_message_len, dissect_pdc, NULL); + return tvb_captured_length(tvb); } void proto_register_pdc(void) @@ -596,7 +597,7 @@ void proto_reg_handoff_pdc(void) if (! initialized) { asterix_handle = find_dissector("asterix"); - pdc_tcp_handle = create_dissector_handle(tcp_dissect_pdc, proto_pdc); + pdc_tcp_handle = new_create_dissector_handle(tcp_dissect_pdc, proto_pdc); dissector_add_for_decode_as("tcp.port", pdc_tcp_handle); initialized = TRUE; } |