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-pw-oam.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-pw-oam.c')
| -rw-r--r-- | epan/dissectors/packet-pw-oam.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-pw-oam.c b/epan/dissectors/packet-pw-oam.c index a6c21f8dcb..a7810e6966 100644 --- a/epan/dissectors/packet-pw-oam.c +++ b/epan/dissectors/packet-pw-oam.c @@ -87,8 +87,8 @@ dissect_pw_status_tlv (tvbuff_t *tvb, proto_tree *tree, gint offset) } /* Dissector for PW OAM protocol: RFC 6478 */ -static void -dissect_pw_oam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_pw_oam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { proto_item *ti = NULL, *ti_flags = NULL; proto_tree *pw_oam_tree = NULL, *pw_oam_flags = NULL; @@ -100,7 +100,7 @@ dissect_pw_oam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) col_clear(pinfo->cinfo, COL_INFO); if (!tree) - return; + return tvb_captured_length(tvb); ti = proto_tree_add_item(tree, proto_pw_oam, tvb, 0, -1, ENC_NA); @@ -139,7 +139,7 @@ dissect_pw_oam(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) break; } - return; + return tvb_captured_length(tvb); } void @@ -206,7 +206,7 @@ proto_reg_handoff_pw_oam(void) { dissector_handle_t pw_oam_handle; - pw_oam_handle = create_dissector_handle( dissect_pw_oam, proto_pw_oam ); + pw_oam_handle = new_create_dissector_handle( dissect_pw_oam, proto_pw_oam ); dissector_add_uint("pwach.channel_type", 0x0027, pw_oam_handle); /* KM: MPLSTP PW-OAM, RFC 6478 */ } |