diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-02-01 20:27:16 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-02-01 20:27:16 +0000 |
| commit | 2f6f1e48af42538413f0ad5a28e166d54f619b37 (patch) | |
| tree | 8edd39f442606c4ae42e98279a063faf0a4802b5 /epan/dissectors/packet-atm.c | |
| parent | d0a48b5beef2f2d42f5c1dbed44df33bd9acaea1 (diff) | |
From Tobias Witek:
Replace ERF dissector with ATM dissector for protocols 'FP Hint' and 'META'
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4384
svn path=/trunk/; revision=31761
Diffstat (limited to 'epan/dissectors/packet-atm.c')
| -rw-r--r-- | epan/dissectors/packet-atm.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/epan/dissectors/packet-atm.c b/epan/dissectors/packet-atm.c index 00e21e3798..db51ba51cf 100644 --- a/epan/dissectors/packet-atm.c +++ b/epan/dissectors/packet-atm.c @@ -1181,19 +1181,20 @@ dissect_reassembled_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, case AAL_2: switch (pinfo->pseudo_header->atm.type) { case TRAF_UMTS_FP: - /* Skip first 4 bytes of message - - side - - length - - UUI - Ignoring for now... */ - proto_tree_add_uint(atm_tree, hf_atm_cid, tvb, 0, 0, - pinfo->pseudo_header->atm.aal2_cid); - proto_item_append_text(atm_ti, " (vpi=%u vci=%u cid=%u)", - pinfo->pseudo_header->atm.vpi, - pinfo->pseudo_header->atm.vci, - pinfo->pseudo_header->atm.aal2_cid); - - next_tvb = tvb_new_subset_remaining(tvb, 4); + proto_tree_add_uint(atm_tree, hf_atm_cid, tvb, 0, 0, + pinfo->pseudo_header->atm.aal2_cid); + proto_item_append_text(atm_ti, " (vpi=%u vci=%u cid=%u)", + pinfo->pseudo_header->atm.vpi, + pinfo->pseudo_header->atm.vci, + pinfo->pseudo_header->atm.aal2_cid); + if ((pinfo->pseudo_header->atm.flags | ATM_AAL2_NOPHDR) == 0) { + /* Skip first 4 bytes of message + - side + - length + - UUI + Ignoring for now... */ + next_tvb = tvb_new_subset_remaining(tvb, 4); + } call_dissector(fp_handle, next_tvb, pinfo, tree); break; |