diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-15 05:42:35 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-15 05:42:35 +0000 |
| commit | 7c3fcbac34993a39ed0f3ed753bfd72a5bcf3c5a (patch) | |
| tree | d236e4d44462d64ef10c1b95c12ca99d8ed68854 /capture.c | |
| parent | 1247a909605a80b9c92c7f15031f0e022affc76e (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 'capture.c')
| -rw-r--r-- | capture.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,7 +1,7 @@ /* capture.c * Routines for packet capture windows * - * $Id: capture.c,v 1.131 2000/11/01 07:38:53 guy Exp $ + * $Id: capture.c,v 1.132 2000/11/15 05:41:41 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -104,6 +104,7 @@ #include "packet-ppp.h" #include "packet-raw.h" #include "packet-tr.h" +#include "packet-ieee80211.h" int promisc_mode = TRUE; /* capture in promiscuous mode */ int sync_mode; /* fork a child to do the capture, and sync between them */ @@ -1004,6 +1005,9 @@ pipe_dispatch(int fd, loop_data *ld, struct pcap_hdr *hdr) case WTAP_ENCAP_LINUX_ATM_CLIP: capture_clip(pd, &ld->counts); break; + case WTAP_ENCAP_IEEE_802_11: + capture_ieee80211(pd,0,&ld->counts); + break; /* XXX - FreeBSD may append 4-byte ATM pseudo-header to DLT_ATM_RFC1483, with LLC header following; we should implement it at some point. */ |