osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Guy Harris 2000-09-23 05:58:26 +00:00
parent 28ac31a634
commit f881e13932
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packet.c
View File

@ -1,7 +1,7 @@
/* packet.c
* Routines for packet disassembly
*
* $Id: packet.c,v 1.109 2000/09/21 04:41:07 gram Exp $
* $Id: packet.c,v 1.110 2000/09/23 05:58:17 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@zing.org>
@ -82,6 +82,7 @@
#include "packet-ipv6.h"
#include "packet-lapb.h"
#include "packet-lapd.h"
#include "packet-llc.h"
#include "packet-null.h"
#include "packet-ppp.h"
#include "packet-raw.h"
@ -1114,6 +1115,12 @@ dissect_packet(union wtap_pseudo_header *pseudo_header, const u_char *pd,
case WTAP_ENCAP_V120 :
dissect_v120(tvb, &pi, tree);
break;
case WTAP_ENCAP_ATM_RFC1483:
dissect_llc(tvb, &pi, tree);
break;
default:
g_assert_not_reached();
break;
}
}
CATCH(BoundsError) {

4
wiretap/netxray.c
View File

@ -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 */
};