diff options
author | Michael Mann <mmann78@netscape.net> | 2015-11-15 16:51:45 -0500 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 22:00:30 +0000 |
commit | 799d6fd057b0c20a7692a1181d811a8ff3a88d04 (patch) | |
tree | 31d6d1248aee7c3192ae6d854b43eeb2c0b996a0 /epan/dissectors/packet-mrp-mmrp.c | |
parent | 92bb13a4d22a48c43aa5fa6910c68829edebfdd0 (diff) |
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 <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-mrp-mmrp.c')
-rw-r--r-- | epan/dissectors/packet-mrp-mmrp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-mrp-mmrp.c b/epan/dissectors/packet-mrp-mmrp.c index 98ea0f250b..f39d49709e 100644 --- a/epan/dissectors/packet-mrp-mmrp.c +++ b/epan/dissectors/packet-mrp-mmrp.c @@ -215,9 +215,8 @@ dissect_mmrp_three_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_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) -{ +static int +dissect_mmrp(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; proto_tree *mmrp_tree, *msg_tree, *attr_list_tree, *vect_attr_tree; @@ -344,6 +343,7 @@ dissect_mmrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(mmrp_tree, hf_mmrp_end_mark, tvb, offset+2, 2, ENC_BIG_ENDIAN); /* Message EndMark */ } + return tvb_captured_length(tvb); } @@ -426,7 +426,7 @@ proto_reg_handoff_mrp_mmrp(void) { dissector_handle_t mmrp_handle; - mmrp_handle = create_dissector_handle(dissect_mmrp, proto_mmrp); + mmrp_handle = new_create_dissector_handle(dissect_mmrp, proto_mmrp); dissector_add_uint("ethertype", ETHERTYPE_MMRP, mmrp_handle); } |