diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-11-15 08:00:10 -0500 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2015-11-16 03:50:05 +0000 |
| commit | bbdd89b973353a0df1d98d884c38f3832670bfea (patch) | |
| tree | 9b992f923f565af2fcab30902508a191de85ca53 /epan/dissectors/packet-ath.c | |
| parent | 6012ba8f008bfba24fd44ce7a2a3055572453dce (diff) | |
create_dissector_handle -> new_create_dissector_handle
Picking off "easy" dissectors that only have one or two exit points at most.
Change-Id: Ie514f126352e7598acc4f7c38db9c61d105d5e48
Reviewed-on: https://code.wireshark.org/review/11850
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-ath.c')
| -rw-r--r-- | epan/dissectors/packet-ath.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-ath.c b/epan/dissectors/packet-ath.c index 08ad2eeb5d..780c67376c 100644 --- a/epan/dissectors/packet-ath.c +++ b/epan/dissectors/packet-ath.c @@ -76,10 +76,9 @@ static gint ett_ath = -1; static expert_field ei_ath_hlen_invalid = EI_INIT; static expert_field ei_ath_hmark_invalid = EI_INIT; -static void -dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - int offset = 0; /* various lengths as reported in the packet itself */ @@ -308,7 +307,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } else { proto_tree_add_expert(tree, pinfo, &ei_ath_hmark_invalid, tvb, offset, -1); - return; + return tvb_captured_length(tvb); } /* set the INFO column, and we're done ! @@ -335,6 +334,7 @@ dissect_ath(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } } + return tvb_captured_length(tvb); } void @@ -440,7 +440,7 @@ proto_reg_handoff_ath(void) { static dissector_handle_t ath_handle; - ath_handle = create_dissector_handle(dissect_ath, proto_ath); + ath_handle = new_create_dissector_handle(dissect_ath, proto_ath); dissector_add_uint("udp.port", ATH_PORT, ath_handle); } |