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-atm.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-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index a4c99f2825..bee9b1dd73 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -687,8 +687,8 @@ capture_lane(const union wtap_pseudo_header *pseudo_header, const guchar *pd, } } -static void -dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { tvbuff_t *next_tvb; tvbuff_t *next_tvb_le_client; @@ -729,12 +729,13 @@ dissect_lane(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) call_dissector(data_handle,next_tvb, pinfo, tree); break; } + return tvb_captured_length(tvb); } -static void -dissect_ilmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +static int +dissect_ilmi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data _U_) { - dissect_snmp_pdu(tvb, 0, pinfo, tree, proto_ilmi, ett_ilmi, FALSE); + return dissect_snmp_pdu(tvb, 0, pinfo, tree, proto_ilmi, ett_ilmi, FALSE); } /* AAL types */ @@ -2035,8 +2036,8 @@ proto_reg_handoff_atm(void) gprs_ns_handle = find_dissector("gprs_ns"); dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS, atm_handle); - dissector_add_uint("atm.aal5.type", TRAF_LANE, create_dissector_handle(dissect_lane, proto_atm_lane)); - dissector_add_uint("atm.aal5.type", TRAF_ILMI, create_dissector_handle(dissect_ilmi, proto_ilmi)); + dissector_add_uint("atm.aal5.type", TRAF_LANE, new_create_dissector_handle(dissect_lane, proto_atm_lane)); + dissector_add_uint("atm.aal5.type", TRAF_ILMI, new_create_dissector_handle(dissect_ilmi, proto_ilmi)); dissector_add_uint("wtap_encap", WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, atm_untruncated_handle); |