From 799d6fd057b0c20a7692a1181d811a8ff3a88d04 Mon Sep 17 00:00:00 2001 From: Michael Mann Date: Sun, 15 Nov 2015 16:51:45 -0500 Subject: create_dissector_handle -> new_create_dissector_handle Picking off "easy" dissectors that only have one or two exit points at most. Change-Id: I96aa9cf53533cbb07105aa400d42922baf3016b3 Reviewed-on: https://code.wireshark.org/review/11860 Petri-Dish: Michael Mann Tested-by: Petri Dish Buildbot Reviewed-by: Michael Mann --- epan/dissectors/packet-mrp-msrp.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'epan/dissectors/packet-mrp-msrp.c') diff --git a/epan/dissectors/packet-mrp-msrp.c b/epan/dissectors/packet-mrp-msrp.c index 50186a6106..6144448483 100644 --- a/epan/dissectors/packet-mrp-msrp.c +++ b/epan/dissectors/packet-mrp-msrp.c @@ -447,8 +447,8 @@ dissect_msrp_four_packed_event(proto_tree *vect_attr_tree, tvbuff_t *tvb, guint * * main dissect function that calls the other functions listed above as necessary */ -static void -dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* Set up structures needed to add the protocol subtrees and manage them */ proto_item *ti, *msg_ti, *attr_list_ti, *vect_attr_ti, *first_value_ti; @@ -629,6 +629,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Multiple Message while() */ proto_tree_add_item(msrp_tree, hf_msrp_end_mark, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Message EndMark */ } + return tvb_captured_length(tvb); } @@ -788,7 +789,7 @@ proto_reg_handoff_mrp_msrp(void) { dissector_handle_t msrp_handle; - msrp_handle = create_dissector_handle(dissect_msrp, proto_msrp); + msrp_handle = new_create_dissector_handle(dissect_msrp, proto_msrp); dissector_add_uint("ethertype", ETHERTYPE_MSRP, msrp_handle); } -- cgit v1.2.3