aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/ngsniffer.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-01-08 22:18:22 +0000
committerGuy Harris <guy@alum.mit.edu>2001-01-08 22:18:22 +0000
commit3f756801910b8b34c5e3da2a6ba541ab742a1af5 (patch)
tree7c3b6d5083fed1466e60217d40d4013dad41dd34 /wiretap/ngsniffer.c
parent8d514ce83c1f81e21bbc9eae12d75b830bfce477 (diff)
Code to handle Frame Relay Sniffer captures, from Jeff Foster.
Code to register the Frame Relay dissector to handle Frame Relay captures, from Paul Ionescu. svn path=/trunk/; revision=2845
Diffstat (limited to 'wiretap/ngsniffer.c')
-rw-r--r--wiretap/ngsniffer.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/wiretap/ngsniffer.c b/wiretap/ngsniffer.c
index 2d46090507..0e0738edf4 100644
--- a/wiretap/ngsniffer.c
+++ b/wiretap/ngsniffer.c
@@ -1,6 +1,6 @@
/* ngsniffer.c
*
- * $Id: ngsniffer.c,v 1.56 2000/11/29 08:24:14 guy Exp $
+ * $Id: ngsniffer.c,v 1.57 2001/01/08 22:18:22 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -733,13 +733,18 @@ found:
/*
* OK, this is from an "Internetwork analyzer"; let's
* look at the first byte of the packet, and figure
- * out whether it's LAPB, LAPD or PPP.
+ * out whether it's LAPB, LAPD, PPP, or Frame Relay.
*/
if (pd[0] == 0xFF) {
/*
* PPP.
*/
wth->file_encap = WTAP_ENCAP_PPP;
+ } else if (pd[0] == 0x34 || pd[0] == 0x28) {
+ /*
+ * Frame Relay.
+ */
+ wth->file_encap = WTAP_ENCAP_FRELAY;
} else if (pd[0] & 1) {
/*
* LAPB.