diff options
| author | Guy Harris <guy@alum.mit.edu> | 2003-01-03 06:45:45 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2003-01-03 06:45:45 +0000 |
| commit | 0a5be3f18be86984f35987779ab29aa032a2468b (patch) | |
| tree | 652a392fcd4049c149d0441b21e8146f1777df23 /wiretap/iptrace.c | |
| parent | decd1f84d1f31bdbf752055be48df06f3297d4e1 (diff) | |
Rename WTAP_ENCAP_ATM_SNIFFER to WTAP_ENCAP_ATM_PDUS, as it's not just
used for the DOS-based ATM Sniffer. (That's not a great name, but I
couldn't think of a better one.)
Add a new WTAP_ENCAP_ATM_PDUS_UNTRUNCATED encapsulation type for capture
files where reassembled frames don't have trailers, such as the AAL5
trailer, chopped off. That's what at least some versions of the
Windows-based ATM Sniffer appear to have.
Map the ATM capture file type for NetXRay captures to
WTAP_ENCAP_ATM_PDUS_UNTRUNCATED, and put in stuff to fill in what we've
reverse-engineered, so far, for the pseudo-header; there's more that
needs to be done on it, e.g. getting the channel, AAL type, and traffic
type (or inferring them if they're not in the packet header).
svn path=/trunk/; revision=6840
Diffstat (limited to 'wiretap/iptrace.c')
| -rw-r--r-- | wiretap/iptrace.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/iptrace.c b/wiretap/iptrace.c index a6526b55fc..9bb1a7aef7 100644 --- a/wiretap/iptrace.c +++ b/wiretap/iptrace.c @@ -1,6 +1,6 @@ /* iptrace.c * - * $Id: iptrace.c,v 1.45 2002/11/01 20:43:11 guy Exp $ + * $Id: iptrace.c,v 1.46 2003/01/03 06:45:45 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -186,7 +186,7 @@ static gboolean iptrace_read_1_0(wtap *wth, int *err, long *data_offset) return FALSE; } - if (wth->phdr.pkt_encap == WTAP_ENCAP_ATM_SNIFFER) { + if (wth->phdr.pkt_encap == WTAP_ENCAP_ATM_PDUS) { get_atm_pseudo_header(data_ptr, wth->phdr.caplen, &wth->pseudo_header, header); } @@ -253,7 +253,7 @@ static gboolean iptrace_seek_read_1_0(wtap *wth, long seek_off, return FALSE; /* Get the ATM pseudo-header, if this is ATM traffic. */ - if (pkt_encap == WTAP_ENCAP_ATM_SNIFFER) + if (pkt_encap == WTAP_ENCAP_ATM_PDUS) get_atm_pseudo_header(pd, packet_size, pseudo_header, header); return TRUE; @@ -369,7 +369,7 @@ static gboolean iptrace_read_2_0(wtap *wth, int *err, long *data_offset) return FALSE; } - if (wth->phdr.pkt_encap == WTAP_ENCAP_ATM_SNIFFER) { + if (wth->phdr.pkt_encap == WTAP_ENCAP_ATM_PDUS) { get_atm_pseudo_header(data_ptr, wth->phdr.caplen, &wth->pseudo_header, header); } @@ -436,7 +436,7 @@ static gboolean iptrace_seek_read_2_0(wtap *wth, long seek_off, return FALSE; /* Get the ATM pseudo-header, if this is ATM traffic. */ - if (pkt_encap == WTAP_ENCAP_ATM_SNIFFER) + if (pkt_encap == WTAP_ENCAP_ATM_PDUS) get_atm_pseudo_header(pd, packet_size, pseudo_header, header); return TRUE; @@ -582,7 +582,7 @@ wtap_encap_ift(unsigned int ift) /* 0x22 */ WTAP_ENCAP_UNKNOWN, /* IFT_PARA */ /* 0x23 */ WTAP_ENCAP_UNKNOWN, /* IFT_ARCNET */ /* 0x24 */ WTAP_ENCAP_UNKNOWN, /* IFT_ARCNETPLUS */ -/* 0x25 */ WTAP_ENCAP_ATM_SNIFFER, /* IFT_ATM */ +/* 0x25 */ WTAP_ENCAP_ATM_PDUS, /* IFT_ATM */ }; #define NUM_IFT_ENCAPS (sizeof ift_encap / sizeof ift_encap[0]) |