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/network_instruments.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/network_instruments.c')
| -rw-r--r-- | wiretap/network_instruments.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/wiretap/network_instruments.c b/wiretap/network_instruments.c index 1e2b6d4386..36d3100a0d 100644 --- a/wiretap/network_instruments.c +++ b/wiretap/network_instruments.c @@ -390,12 +390,16 @@ read_packet_header(FILE_T fh, union wtap_pseudo_header *pseudo_header, err, err_info)) return -1; /* update the pseudo header */ + pseudo_header->ieee_802_11.presence_flags = + PHDR_802_11_HAS_CHANNEL | + PHDR_802_11_HAS_DATA_RATE | + PHDR_802_11_HAS_SIGNAL_PERCENT; pseudo_header->ieee_802_11.fcs_len = 0; /* set decryption status */ pseudo_header->ieee_802_11.decrypted = (wireless_header.conditions & WIRELESS_WEP_SUCCESS) != 0; pseudo_header->ieee_802_11.channel = wireless_header.frequency; pseudo_header->ieee_802_11.data_rate = wireless_header.rate; - pseudo_header->ieee_802_11.signal_level = wireless_header.strengthPercent; + pseudo_header->ieee_802_11.signal_percent = wireless_header.strengthPercent; offset += (int)sizeof wireless_header; break; default: |