diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-09-23 05:58:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-09-23 05:58:26 +0000 |
| commit | f881e13932e0ba390c26cce15d1334b2154a8062 (patch) | |
| tree | 95520f81afa2dda6b72591361cc145137e5ab6fe /wiretap | |
| parent | 28ac31a63485446a0fe2c30b6947cd6d1d8b6881 (diff) | |
Windows Sniffers appear to write out ATM traces with a network type of
8, which is NDIS's ATM type. At least one capture appears to have
LLC-encapsulated frames in it; for now, we'll map it to
WTAP_ENCAP_ATM_RFC1483 - and make Ethereal dissect
WTAP_ENCAP_ATM_RFC1483 by handing the frames to "dissect_llc()".
While we're at it, we'll have Ethereal panic if handed a Wiretap packet
type it doesn't dissect, rather than giving you a rather blank
dissection.
svn path=/trunk/; revision=2457
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/netxray.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index c998a7bfa1..16123ecae6 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1,6 +1,6 @@ /* netxray.c * - * $Id: netxray.c,v 1.32 2000/09/21 04:41:32 gram Exp $ + * $Id: netxray.c,v 1.33 2000/09/23 05:58:26 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org> @@ -117,7 +117,7 @@ int netxray_open(wtap *wth, int *err) WTAP_ENCAP_UNKNOWN, /* "DIX" - should not occur */ WTAP_ENCAP_UNKNOWN, /* ARCNET raw */ WTAP_ENCAP_UNKNOWN, /* ARCNET 878.2 */ - WTAP_ENCAP_UNKNOWN, /* ATM */ + WTAP_ENCAP_ATM_RFC1483, /* ATM */ WTAP_ENCAP_UNKNOWN, /* Wireless WAN */ WTAP_ENCAP_UNKNOWN /* IrDA */ }; |