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-mdshdr.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-mdshdr.c')
| -rw-r--r-- | epan/dissectors/packet-mdshdr.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/epan/dissectors/packet-mdshdr.c b/epan/dissectors/packet-mdshdr.c index 34a427296d..87387a3cd5 100644 --- a/epan/dissectors/packet-mdshdr.c +++ b/epan/dissectors/packet-mdshdr.c @@ -129,8 +129,8 @@ static const value_string eof_vals[] = { {0, NULL}, }; -static void -dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { /* Set up structures needed to add the protocol subtree and manage it */ @@ -244,6 +244,7 @@ dissect_mdshdr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) else { call_dissector(data_handle, next_tvb, pinfo, tree); } + return tvb_captured_length(tvb); } @@ -319,7 +320,7 @@ proto_reg_handoff_mdshdr(void) * ethertype ETHERTYPE_FCFT, and fetch the data and Fibre * Channel handles. */ - mdshdr_handle = create_dissector_handle(dissect_mdshdr, proto_mdshdr); + mdshdr_handle = new_create_dissector_handle(dissect_mdshdr, proto_mdshdr); dissector_add_uint("ethertype", ETHERTYPE_FCFT, mdshdr_handle); data_handle = find_dissector("data"); fc_dissector_handle = find_dissector("fc"); |