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-x11.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-x11.c')
| -rw-r--r-- | epan/dissectors/packet-x11.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/epan/dissectors/packet-x11.c b/epan/dissectors/packet-x11.c index dd6afe25f9..68180202d6 100644 --- a/epan/dissectors/packet-x11.c +++ b/epan/dissectors/packet-x11.c @@ -5757,8 +5757,8 @@ dissect_x11_error(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, *** *** ************************************************************************/ -static void -dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "X11"); @@ -5766,6 +5766,8 @@ dissect_x11(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) dissect_x11_replies(tvb, pinfo, tree); else dissect_x11_requests(tvb, pinfo, tree); + + return tvb_captured_length(tvb); } /* Register the protocol with Wireshark */ @@ -5861,7 +5863,7 @@ proto_reg_handoff_x11(void) { dissector_handle_t x11_handle; - x11_handle = create_dissector_handle(dissect_x11, proto_x11); + x11_handle = new_create_dissector_handle(dissect_x11, proto_x11); dissector_add_uint("tcp.port", TCP_PORT_X11, x11_handle); dissector_add_uint("tcp.port", TCP_PORT_X11_2, x11_handle); dissector_add_uint("tcp.port", TCP_PORT_X11_3, x11_handle); |