osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

ieee80211: disable wireless timeline by default 

As the wireless timeline is not fully finished and undocumented, disable
this GUI feature for now. This should avoid some user confusion when
opening an 802.11 trace.

For experimental and development purposes, the feature can be enabled
via the preferences (right-click on the "802.11 radio information"
layer, Protocol Preferences, Enable Wireless Timeline (experimental)").

Change-Id: Ieb529ccc0f23a051bcaba21ad18ac3c1d63b850e
Ping-Bug: 13769
Reviewed-on: https://code.wireshark.org/review/22558
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
Reviewed-by: Simon Barber <simon.barber@meraki.net>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
This commit is contained in:
Peter Wu 2017-07-08 16:33:26 +02:00
parent c4c4c44a21
commit f7fef949e7
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
epan/dissectors/packet-ieee80211-radio.c
View File

@ -111,6 +111,7 @@ static int wlan_radio_timeline_tap = -1;
/* Settings */
static gboolean wlan_radio_always_short_preamble = FALSE;
static gboolean wlan_radio_tsf_at_end = TRUE;
static gboolean wlan_radio_timeline_enabled = FALSE;
static const value_string phy_vals[] = {
{ PHDR_802_11_PHY_11_FHSS, "802.11 FHSS" },
@ -1176,7 +1177,9 @@ dissect_wlan_radio_phdr (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree,
}
} /* if (have_data_rate) */
tap_queue_packet(wlan_radio_timeline_tap, pinfo, wlan_radio_info);
if (wlan_radio_timeline_enabled) {
tap_queue_packet(wlan_radio_timeline_tap, pinfo, wlan_radio_info);
}
if (!pinfo->fd->flags.visited) {
previous_frame.radio_info = wlan_radio_info;
@ -1474,6 +1477,10 @@ void proto_register_ieee80211_radio(void)
"TSF indicates the end of the PPDU",
"Some generators timestamp the end of the PPDU rather than the start of the (A)MPDU.",
&wlan_radio_tsf_at_end);
prefs_register_bool_preference(wlan_radio_module, "timeline",
"Enable Wireless Timeline (experimental)",
"Enables an additional panel for navigating through packets",
&wlan_radio_timeline_enabled);
register_init_routine( setup_ieee80211_radio );
register_cleanup_routine( cleanup_ieee80211_radio );