diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-10-29 16:03:08 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-10-29 23:04:05 +0000 |
| commit | 8165448504749c0a0554e2eef1964f6c88bad15d (patch) | |
| tree | 14c6d3e8bc73052fe818519de7260e3bb672a4e6 /wiretap/pcap-common.c | |
| parent | 4acf4955f54c1fba30fdf2dc0dd4e11f6a3595b5 (diff) | |
Expand the 802.11 pseudo-header and support new radio metadata.
Add a set of presence bits, so we can indicate which bits of radio
metadata we do and don't have.
Fill in more radio metadata from capture files, and display it.
(More to come.)
Change-Id: Idea2c05442c74af17c14c4d5a8d8025ab27fbd15
Reviewed-on: https://code.wireshark.org/review/4987
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'wiretap/pcap-common.c')
| -rw-r--r-- | wiretap/pcap-common.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/wiretap/pcap-common.c b/wiretap/pcap-common.c index a28c3248fc..c71ba76f57 100644 --- a/wiretap/pcap-common.c +++ b/wiretap/pcap-common.c @@ -1576,15 +1576,16 @@ pcap_process_pseudo_header(FILE_T fh, int file_type, int wtap_encap, 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 - * supplies an FCS? + * We don't know whether there's an FCS in this frame or not, + * at least in pcap files. For radiotap, that's indicated in + * the radiotap header. + * + * XXX - in pcap-ng, there *could* be a packet option + * indicating the FCS length. */ + phdr->pseudo_header.ieee_802_11.presence_flags = 0; /* absent or supplied in the packet data */ phdr->pseudo_header.ieee_802_11.fcs_len = -1; phdr->pseudo_header.ieee_802_11.decrypted = FALSE; - phdr->pseudo_header.ieee_802_11.channel = 0; - phdr->pseudo_header.ieee_802_11.data_rate = 0; - phdr->pseudo_header.ieee_802_11.signal_level = 0; break; case WTAP_ENCAP_IRDA: |