From f1bc598d87aeba56f2bd4a1151543664388bb8c7 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Thu, 25 Jun 2015 12:14:39 -0700 Subject: Clean up 802.11 radio information handling. Have a field that holds the PHY type but nothing else. Have a union with structures holding PHY-type-specific information, as a bunch of attributes are PHY-specific. If we have a channel and band, but don't have the frequency, attempt to calculate the frequency, and add that to the radio information if we succeed. If we have the frequency, but don't have the channel, attempt to calculate the channel, and add that to the radio information if we succeed. Handle FHSS information, 11a "half/quarter-clocked" and turbo information, 11g normal vs. Super G, additional 11n and 11ac information, and the "short preamble" flag for 11b and 11g. Add a PHY type for 11 legacy DSSS and detect it if possible. Clean up the AVS dissector - make all fields wlancap. fields (if you want generic fields, use the wlan_radio. fields). Set more fields when writing out Commview Wi-Fi files. Change-Id: I691ac59f5e9e1a23779b56a65124049914b72e69 Reviewed-on: https://code.wireshark.org/review/9146 Reviewed-by: Guy Harris --- wiretap/snoop.c | 1 + 1 file changed, 1 insertion(+) (limited to 'wiretap/snoop.c') diff --git a/wiretap/snoop.c b/wiretap/snoop.c index b50912da05..7ed4f7d6fb 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -741,6 +741,7 @@ snoop_read_shomiti_wireless_pseudoheader(FILE_T fh, pseudo_header->ieee_802_11.fcs_len = 4; pseudo_header->ieee_802_11.decrypted = FALSE; pseudo_header->ieee_802_11.datapad = FALSE; + pseudo_header->ieee_802_11.phy = PHDR_802_11_PHY_UNKNOWN; pseudo_header->ieee_802_11.presence_flags = PHDR_802_11_HAS_CHANNEL | PHDR_802_11_HAS_DATA_RATE | -- cgit v1.2.1