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/ngsniffer.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/ngsniffer.c')
| -rw-r--r-- | wiretap/ngsniffer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c index ca88a4324a..3483fcf076 100644 --- a/wiretap/ngsniffer.c +++ b/wiretap/ngsniffer.c @@ -1,6 +1,6 @@ /* ngsniffer.c * - * $Id: ngsniffer.c,v 1.95 2002/12/20 22:30:15 guy Exp $ + * $Id: ngsniffer.c,v 1.96 2003/01/03 06:45:45 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -406,7 +406,7 @@ int ngsniffer_open(wtap *wth, int *err) WTAP_ENCAP_PER_PACKET, /* Internetwork analyzer (synchronous) */ WTAP_ENCAP_PER_PACKET, /* Internetwork analyzer (asynchronous) */ WTAP_ENCAP_FDDI_BITSWAPPED, - WTAP_ENCAP_ATM_SNIFFER + WTAP_ENCAP_ATM_PDUS }; #define NUM_NGSNIFF_ENCAPS (sizeof sniffer_encap / sizeof sniffer_encap[0]) gboolean is_router; @@ -540,7 +540,7 @@ int ngsniffer_open(wtap *wth, int *err) wth->snapshot_length = 0; /* not available in header, only in frame */ wth->capture.ngsniffer->timeunit = Usec[version.timeunit]; wth->capture.ngsniffer->is_atm = - (wth->file_encap == WTAP_ENCAP_ATM_SNIFFER); + (wth->file_encap == WTAP_ENCAP_ATM_PDUS); wth->capture.ngsniffer->is_router = is_router; /* Get capture start time */ @@ -1685,7 +1685,7 @@ static const int wtap_encap[] = { -1, /* WTAP_ENCAP_ATM_RFC1483 */ -1, /* WTAP_ENCAP_LINUX_ATM_CLIP */ 7, /* WTAP_ENCAP_LAPB -> Internetwork analyzer (synchronous) */ - -1, /* WTAP_ENCAP_ATM_SNIFFER */ + -1, /* WTAP_ENCAP_ATM_PDUS */ -1, /* WTAP_ENCAP_NULL -> unsupported */ -1, /* WTAP_ENCAP_ASCEND -> unsupported */ -1, /* WTAP_ENCAP_ISDN -> unsupported */ |