diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-10 04:04:42 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-10 04:04:42 +0000 |
| commit | 50e696df812a10e47bb6c2b132728b826ca82a60 (patch) | |
| tree | 7e5ca309b08cac82b6faa42f0296a645c4273940 /packet-atm.c | |
| parent | 6b49b2475cae484188cf4d3b216c5271183d157c (diff) | |
The Sniffer file formats include a file to identify raw cells; export
that flag in the ATM pseudo-header, and use it to determine whether a
frame is a raw cell or a reassembled frame, rather than using the AAL,
as you can have raw AAL5 cells in a capture.
svn path=/trunk/; revision=6889
Diffstat (limited to 'packet-atm.c')
| -rw-r--r-- | packet-atm.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/packet-atm.c b/packet-atm.c index 51df856d56..bdd57d9b9b 100644 --- a/packet-atm.c +++ b/packet-atm.c @@ -1,7 +1,7 @@ /* packet-atm.c * Routines for ATM packet disassembly * - * $Id: packet-atm.c,v 1.56 2003/01/09 04:11:08 guy Exp $ + * $Id: packet-atm.c,v 1.57 2003/01/10 04:04:39 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -1511,14 +1511,13 @@ dissect_atm_common(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, val_to_str(pinfo->pseudo_header->atm.aal, aal_vals, "Unknown AAL (%u)")); } - if (pinfo->pseudo_header->atm.aal == AAL_5 || - pinfo->pseudo_header->atm.aal == AAL_SIGNALLING) { - /* This is a reassembled PDU. */ - dissect_reassembled_pdu(tvb, pinfo, tree, atm_tree, truncated); - } else { - /* Assume this is a single cell, with the cell header at the beginning. */ + if (pinfo->pseudo_header->atm.flags & ATM_IS_CELL) { + /* This is a single cell, with the cell header at the beginning. */ proto_item_set_len(ti, 5); dissect_atm_cell(tvb, pinfo, tree, atm_tree); + } else { + /* This is a reassembled PDU. */ + dissect_reassembled_pdu(tvb, pinfo, tree, atm_tree, truncated); } } |