diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-05-02 03:11:00 +0000 |
| commit | 0275247b9788e74a97414abc74f6e9f12868ee57 (patch) | |
| tree | e683bcda97ba1f4c5b23656635d578a9d897f51a /wiretap/pcap-common.c | |
| parent | 8be799ecafab97966bb85f83ed105fe0e389c8dc (diff) | |
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
Diffstat (limited to 'wiretap/pcap-common.c')
| -rw-r--r-- | wiretap/pcap-common.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index 0cc27620e4..b624aa934e 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -225,11 +225,11 @@ static const struct { { 117, WTAP_ENCAP_PFLOG }, { 118, WTAP_ENCAP_CISCO_IOS }, - { 119, WTAP_ENCAP_PRISM_HEADER }, /* Prism monitor mode hdr */ + { 119, WTAP_ENCAP_IEEE_802_11_PRISM }, /* 802.11 plus Prism monitor mode radio header */ { 121, WTAP_ENCAP_HHDLC }, /* HiPath HDLC */ { 122, WTAP_ENCAP_IP_OVER_FC }, /* RFC 2625 IP-over-FC */ { 123, WTAP_ENCAP_ATM_PDUS }, /* SunATM */ - { 127, WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP }, /* 802.11 plus radiotap WLAN header */ + { 127, WTAP_ENCAP_IEEE_802_11_RADIOTAP }, /* 802.11 plus radiotap radio header */ { 128, WTAP_ENCAP_TZSP }, /* Tazmen Sniffer Protocol */ { 129, WTAP_ENCAP_ARCNET_LINUX }, { 130, WTAP_ENCAP_JUNIPER_MLPPP }, /* Juniper MLPPP on ML-, LS-, AS- PICs */ @@ -270,7 +270,7 @@ static const struct { { 161, WTAP_ENCAP_USER14 }, { 162, WTAP_ENCAP_USER15 }, - { 163, WTAP_ENCAP_IEEE_802_11_WLAN_AVS }, /* 802.11 plus AVS WLAN header */ + { 163, WTAP_ENCAP_IEEE_802_11_AVS }, /* 802.11 plus AVS radio header */ /* * 164 is reserved for Juniper-private chassis-internal @@ -1477,9 +1477,9 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, break; case WTAP_ENCAP_IEEE_802_11: - case WTAP_ENCAP_PRISM_HEADER: - case WTAP_ENCAP_IEEE_802_11_WLAN_RADIOTAP: - case WTAP_ENCAP_IEEE_802_11_WLAN_AVS: + case WTAP_ENCAP_IEEE_802_11_PRISM: + case WTAP_ENCAP_IEEE_802_11_RADIOTAP: + case WTAP_ENCAP_IEEE_802_11_AVS: /* * We don't know whether there's an FCS in this frame or not. * XXX - are there any OSes where the capture mechanism |