diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-06-22 15:04:28 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-06-22 22:05:17 +0000 |
| commit | 8aa91b31b90e6ba2ab7391c0395548a3901df9d0 (patch) | |
| tree | bd1c52fd465235c87fd944a88905bdc7191b3259 /wiretap/netxray.c | |
| parent | 8abe108a3c942a10b58d58a1974cda49e10b2a43 (diff) | |
Provide PHY type and band information in the 802.11 pseudo-header.
Provide that information so that the "802.11 radio information" protocol
can indicate whether a packet was 802.11 legacy/11b/11a/11g/11n/11ac,
and possibly whether it's 2.4 GHz or 5 GHz 11n. (Sometimes the center
frequency might not be supplied, so the band information can be useful.)
Also, provide some 11ac information, now that we can distinguish between
11n and 11ac. Don't calculate the data rate from the MCS index unless
it's 11n; we don't yet have code to calculate it for 11ac.
For radiotap, only provide guard interval information for 11n and 11ac,
not for earlier standards.
Handle the 11ac flag in the Peek remote protocol.
For Peek tagged files, the "extension flags" are 11n/11ac flags, so we
don't have to check for the "MCS used" bit in order to decide that the
packet is 11n or 11ac or to decide whether to provide the "bandwidth" or
"short GI" information.
Change-Id: Ia8a1a9b11a35243ed84eb4e72c384cc77512b098
Reviewed-on: https://code.wireshark.org/review/9032
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/netxray.c')
| -rw-r--r-- | wiretap/netxray.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/wiretap/netxray.c b/wiretap/netxray.c index 483ec9b77b..4c55904195 100644 --- a/wiretap/netxray.c +++ b/wiretap/netxray.c @@ -1253,6 +1253,11 @@ netxray_process_rec_header(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, phdr->pseudo_header.ieee_802_11.decrypted = FALSE; phdr->pseudo_header.ieee_802_11.datapad = FALSE; + /* + * XXX - any other information, such as PHY + * type, frequency, 11n/11ac information, + * etc.? + */ phdr->pseudo_header.ieee_802_11.channel = hdr.hdr_2_x.xxx[12]; phdr->pseudo_header.ieee_802_11.data_rate = |