From 0275247b9788e74a97414abc74f6e9f12868ee57 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 2 May 2012 03:11:00 +0000 Subject: Use WTAP_ENCAP_IEEE_802_11_xxx for all the "802.11 plus radio header" encapsulations. For pre-V9 AiroPeek captures, leave the radio information in the packet data, just as we do with the Prism, AVS, radiotap, and NetMon headers. Add a dissector for it. svn path=/trunk/; revision=42379 --- capture_info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'capture_info.c') diff --git a/capture_info.c b/capture_info.c index 48102d9474..e2506beea2 100644 --- a/capture_info.c +++ b/capture_info.c @@ -286,7 +286,7 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, case WTAP_ENCAP_FDDI_BITSWAPPED: capture_fddi(pd, caplen, counts); break; - case WTAP_ENCAP_PRISM_HEADER: + case WTAP_ENCAP_IEEE_802_11_PRISM: capture_prism(pd, 0, caplen, counts); break; case WTAP_ENCAP_TOKEN_RING: @@ -311,10 +311,10 @@ capture_info_packet(packet_counts *counts, gint wtap_linktype, const guchar *pd, case WTAP_ENCAP_IEEE_802_11_WITH_RADIO: capture_ieee80211(pd, 0, caplen, counts); break; - case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP: + case WTAP_ENCAP_IEEE_802_11_RADIOTAP: capture_radiotap(pd, 0, caplen, counts); break; - case WTAP_ENCAP_IEEE_802_11_WLAN_AVS: + case WTAP_ENCAP_IEEE_802_11_AVS: capture_wlancap(pd, 0, caplen, counts); break; case WTAP_ENCAP_CHDLC: -- cgit v1.2.1