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-maccontrol.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-maccontrol.c')
| -rw-r--r-- | epan/dissectors/packet-maccontrol.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-maccontrol.c b/epan/dissectors/packet-maccontrol.c index 8aff7f7102..d727009b5d 100644 --- a/epan/dissectors/packet-maccontrol.c +++ b/epan/dissectors/packet-maccontrol.c @@ -129,8 +129,8 @@ static const value_string reg_flags_vals[] = { static const guint8 dst_addr[] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x01}; static const address macctrl_dst_address = { AT_ETHER, 6, dst_addr}; -static void -dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti, *opcode_item; proto_tree *macctrl_tree = NULL; @@ -250,6 +250,7 @@ dissect_macctrl(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) expert_add_info(pinfo, opcode_item, &ei_macctrl_opcode); break; } + return tvb_captured_length(tvb); } void @@ -391,7 +392,7 @@ proto_reg_handoff_macctrl(void) { dissector_handle_t macctrl_handle; - macctrl_handle = create_dissector_handle(dissect_macctrl, proto_macctrl); + macctrl_handle = new_create_dissector_handle(dissect_macctrl, proto_macctrl); dissector_add_uint("ethertype", ETHERTYPE_MAC_CONTROL, macctrl_handle); } |