summaryrefslogtreecommitdiff
path: root/usr.sbin/tcpdump/tcpdump.c
diff options
context:
space:
mode:
authorReyk Floeter <reyk@cvs.openbsd.org>2005-05-28 09:01:53 +0000
committerReyk Floeter <reyk@cvs.openbsd.org>2005-05-28 09:01:53 +0000
commitc898c287950c0a12132104e4ad19cc332d24fc9c (patch)
tree2bbc41f3eb5904efef6cf477ccc9f9bca88b1289 /usr.sbin/tcpdump/tcpdump.c
parent9b2df6b53ef766bd6c36f2dc91c8af2d240a2586 (diff)
support decapsulation of 802.11 data frames
ok canacar@
Diffstat (limited to 'usr.sbin/tcpdump/tcpdump.c')
-rw-r--r--usr.sbin/tcpdump/tcpdump.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/usr.sbin/tcpdump/tcpdump.c b/usr.sbin/tcpdump/tcpdump.c
index b168ea4b95d..8d4ef9f17a2 100644
--- a/usr.sbin/tcpdump/tcpdump.c
+++ b/usr.sbin/tcpdump/tcpdump.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcpdump.c,v 1.45 2005/05/22 18:41:34 moritz Exp $ */
+/* $OpenBSD: tcpdump.c,v 1.46 2005/05/28 09:01:52 reyk Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
@@ -26,7 +26,7 @@ static const char copyright[] =
"@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
The Regents of the University of California. All rights reserved.\n";
static const char rcsid[] =
- "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.c,v 1.45 2005/05/22 18:41:34 moritz Exp $ (LBL)";
+ "@(#) $Header: /cvs/OpenBSD/src/usr.sbin/tcpdump/tcpdump.c,v 1.46 2005/05/28 09:01:52 reyk Exp $ (LBL)";
#endif
/*
@@ -451,8 +451,11 @@ main(int argc, char **argv)
if (snaplen == 0) {
switch (dlt) {
+ case DLT_IEEE802_11:
+ snaplen = IEEE802_11_SNAPLEN;
+ break;
case DLT_IEEE802_11_RADIO:
- snaplen = RADIOTAP_SNAPLEN;
+ snaplen = IEEE802_11_RADIO_SNAPLEN;
break;
default:
snaplen = DEFAULT_SNAPLEN;