aboutsummaryrefslogtreecommitdiffstats
path: root/packet.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-09-23 05:58:26 +0000
committerGuy Harris <guy@alum.mit.edu>2000-09-23 05:58:26 +0000
commitf881e13932e0ba390c26cce15d1334b2154a8062 (patch)
tree95520f81afa2dda6b72591361cc145137e5ab6fe /packet.c
parent28ac31a63485446a0fe2c30b6947cd6d1d8b6881 (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 'packet.c')
-rw-r--r--packet.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/packet.c b/packet.c
index 8b305a453e..a5b0cf8282 100644
--- a/packet.c
+++ b/packet.c
@@ -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) {