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-vicp.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-vicp.c')
-rw-r--r-- | epan/dissectors/packet-vicp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-vicp.c b/epan/dissectors/packet-vicp.c index b2bae91d48..d46db0c3ce 100644 --- a/epan/dissectors/packet-vicp.c +++ b/epan/dissectors/packet-vicp.c @@ -43,7 +43,7 @@ static gint ett_vicp = -1; void proto_register_vicp(void); void proto_reg_handoff_vicp(void); -static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti; proto_tree *vicp_tree; @@ -54,7 +54,7 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (tvb_reported_length_remaining(tvb, 0) < 8) { /* Payload too small for VICP */ - return; + return 0; } col_set_str(pinfo->cinfo, COL_PROTOCOL, "VICP"); @@ -76,6 +76,7 @@ static void dissect_vicp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) ptvcursor_add(cursor, hf_vicp_data, len, ENC_NA); ptvcursor_free(cursor); + return tvb_captured_length(tvb); } void proto_register_vicp(void) @@ -114,7 +115,7 @@ void proto_register_vicp(void) void proto_reg_handoff_vicp(void) { dissector_handle_t vicp_handle; - vicp_handle = create_dissector_handle(dissect_vicp, proto_vicp); + vicp_handle = new_create_dissector_handle(dissect_vicp, proto_vicp); dissector_add_uint("tcp.port", VICP_PORT, vicp_handle); } |