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 /wiretap/netxray.c | |
parent | 6b49b2475cae484188cf4d3b216c5271183d157c (diff) | |
download | wireshark-50e696df812a10e47bb6c2b132728b826ca82a60.tar.gz wireshark-50e696df812a10e47bb6c2b132728b826ca82a60.tar.bz2 wireshark-50e696df812a10e47bb6c2b132728b826ca82a60.zip |
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 'wiretap/netxray.c')
-rw-r--r-- | wiretap/netxray.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 3ee0267dc8..0d69f2f002 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1,6 +1,6 @@ /* netxray.c * - * $Id: netxray.c,v 1.73 2003/01/09 01:55:12 guy Exp $ + * $Id: netxray.c,v 1.74 2003/01/10 04:04:41 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -645,6 +645,12 @@ netxray_set_pseudo_header(wtap *wth, const guint8 *pd, int len, break; case WTAP_ENCAP_ATM_PDUS_UNTRUNCATED: + pseudo_header->atm.flags = 0; + /* + * XXX - is 0x08 an "OAM cell" flag? + */ + if (hdr->hdr_2_x.xxx[9] & 0x04) + pseudo_header->atm.flags |= ATM_RAW_CELL; pseudo_header->atm.vpi = hdr->hdr_2_x.xxx[11]; pseudo_header->atm.vci = pletohs(&hdr->hdr_2_x.xxx[12]); pseudo_header->atm.channel = |