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 /packet-frame.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 'packet-frame.c')
| -rw-r--r-- | packet-frame.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packet-frame.c b/packet-frame.c index 01456f429c..ac44f81d5c 100644 --- a/packet-frame.c +++ b/packet-frame.c @@ -2,7 +2,7 @@ * * Top-most dissector. Decides dissector based on Wiretap Encapsulation Type. * - * $Id: packet-frame.c,v 1.1 2000/10/06 10:10:49 gram Exp $ + * $Id: packet-frame.c,v 1.2 2000/11/15 05:41:42 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -51,7 +51,7 @@ #include "packet-tr.h" #include "packet-v120.h" #include "packet-vines.h" - +#include "packet-ieee80211.h" static int proto_frame = -1; static int hf_frame_arrival_time = -1; @@ -174,6 +174,9 @@ dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) case WTAP_ENCAP_ATM_RFC1483: dissect_llc(tvb, pinfo, tree); break; + case WTAP_ENCAP_IEEE_802_11 : + dissect_ieee80211(tvb,pinfo,tree); + break; default: g_assert_not_reached(); break; |