aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/wtap.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2000-11-15 05:42:35 +0000
committerGuy Harris <guy@alum.mit.edu>2000-11-15 05:42:35 +0000
commit7c3fcbac34993a39ed0f3ed753bfd72a5bcf3c5a (patch)
treed236e4d44462d64ef10c1b95c12ca99d8ed68854 /wiretap/wtap.h
parent1247a909605a80b9c92c7f15031f0e022affc76e (diff)
IEEE 802.11 support, from Johan Jorgensen of Axis Communications AB.
Add in stuff for a bunch of libpcap formats either in libpcap 0.5.2 or in the current CVS version; we don't implement all of them in Ethereal/Wiretap (those are "#if 0"ed out), but we do implement the IEEE 802.11 stuff (which isn't yet in libpcap or tcpdump, but the CVS version of libpcap *does* reserve 105 as the encapsulation type number for 802.11). svn path=/trunk/; revision=2646
Diffstat (limited to 'wiretap/wtap.h')
-rw-r--r--wiretap/wtap.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/wtap.h b/wiretap/wtap.h
index 43426a1993..0f138e98da 100644
--- a/wiretap/wtap.h
+++ b/wiretap/wtap.h
@@ -1,6 +1,6 @@
/* wtap.h
*
- * $Id: wtap.h,v 1.81 2000/09/21 04:41:37 gram Exp $
+ * $Id: wtap.h,v 1.82 2000/11/15 05:41:48 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@xiexie.org>
@@ -94,9 +94,10 @@
#define WTAP_ENCAP_LAPD 15
#define WTAP_ENCAP_V120 16
#define WTAP_ENCAP_PPP_WITH_PHDR 17
+#define WTAP_ENCAP_IEEE_802_11 18
/* last WTAP_ENCAP_ value + 1 */
-#define WTAP_NUM_ENCAP_TYPES 18
+#define WTAP_NUM_ENCAP_TYPES 19
/* File types that can be read by wiretap.
We support writing some many of these file types, too, so we