aboutsummaryrefslogtreecommitdiffstats
path: root/wiretap/libpcap.c
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2001-11-28 07:11:11 +0000
committerGuy Harris <guy@alum.mit.edu>2001-11-28 07:11:11 +0000
commit56636f157abdc8472bcf43de4837d5af2058de16 (patch)
treebbe4c8fe37fb2677a6f3f3ab3313b96935381174 /wiretap/libpcap.c
parentc0b335070c3b8156aed2bf2bf85110ddf9c8275e (diff)
Support for 802.11+Prism II monitor-mode link-layer headers, from
Tim Newsham. Add in missing item for WTAP_ENCAP_CISCO_IOS in the Wiretap encapsulation type table. svn path=/trunk/; revision=4290
Diffstat (limited to 'wiretap/libpcap.c')
-rw-r--r--wiretap/libpcap.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c
index e180ae9840..19df0d8abb 100644
--- a/wiretap/libpcap.c
+++ b/wiretap/libpcap.c
@@ -1,6 +1,6 @@
/* libpcap.c
*
- * $Id: libpcap.c,v 1.59 2001/11/14 22:54:26 guy Exp $
+ * $Id: libpcap.c,v 1.60 2001/11/28 07:11:10 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu>
@@ -364,7 +364,8 @@ static const struct {
*/
{ 113, WTAP_ENCAP_SLL }, /* Linux cooked capture */
- { 118, WTAP_ENCAP_CISCO_IOS },
+ { 118, WTAP_ENCAP_CISCO_IOS },
+ { 119, WTAP_ENCAP_PRISM }, /* Prism monitor mode hdr */
};
#define NUM_PCAP_ENCAPS (sizeof pcap_to_wtap_map / sizeof pcap_to_wtap_map[0])