diff options
| author | Mikael Kanstrup <mikael.kanstrup@gmail.com> | 2016-09-14 14:21:10 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2016-09-16 04:32:23 +0000 |
| commit | 8def685972f0589551a88bcb41d7bb2e039d5627 (patch) | |
| tree | e043a2ea483e40ac915051a53aadfd108bc94c9b /ui | |
| parent | f674ef75d765a7933774b8659ca20ef0ef16e78d (diff) | |
Use valid channel parameters from wireless toolbar
Both the QT and GTK wireless toolbar used "-1" to indicate unused
channel parameters. This was an undocumented feature that recently
stopped working. Use the now documented way (NULL) to specify that
some parameters are not used.
Bug: 12896
Change-Id: I4a93a15ba1d880592b355b7eca155632a4b92ea0
Reviewed-on: https://code.wireshark.org/review/17700
Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu>
Petri-Dish: Gilbert Ramirez <gram@alumni.rice.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/main_80211_toolbar.c | 2 | ||||
| -rw-r--r-- | ui/qt/wireless_frame.cpp | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ui/gtk/main_80211_toolbar.c b/ui/gtk/main_80211_toolbar.c index a844ef7159..83150fcaac 100644 --- a/ui/gtk/main_80211_toolbar.c +++ b/ui/gtk/main_80211_toolbar.c @@ -170,7 +170,7 @@ tb80211_do_set_channel(char *iface, int freq, int type) freq_s = g_strdup_printf("%d", freq); type_s = ws80211_chan_type_to_str(type); - ret = sync_interface_set_80211_chan(iface, freq_s, type_s, "-1", "-1", + ret = sync_interface_set_80211_chan(iface, freq_s, type_s, NULL, NULL, &data, &primary_msg, &secondary_msg, main_window_update); /* Parse the error msg */ diff --git a/ui/qt/wireless_frame.cpp b/ui/qt/wireless_frame.cpp index 87409569f3..c1bb9f14ae 100644 --- a/ui/qt/wireless_frame.cpp +++ b/ui/qt/wireless_frame.cpp @@ -279,16 +279,22 @@ void WirelessFrame::setInterfaceInfo() int bandwidth = getBandwidthFromChanType(chan_type); int center_freq = getCenterFrequency(frequency, bandwidth); const gchar *chan_type_s = ws80211_chan_type_to_str(chan_type); + gchar *center_freq_s = NULL; gchar *data, *primary_msg, *secondary_msg; int ret; if (frequency < 0 || chan_type < 0) return; + if (center_freq != -1) { + center_freq_s = g_strdup(QString::number(center_freq).toUtf8().constData()); + } + ret = sync_interface_set_80211_chan(cur_iface.toUtf8().constData(), QString::number(frequency).toUtf8().constData(), chan_type_s, - QString::number(center_freq).toUtf8().constData(), "-1", + center_freq_s, NULL, &data, &primary_msg, &secondary_msg, main_window_update); + g_free(center_freq_s); g_free(data); g_free(primary_msg); g_free(secondary_msg); |