diff options
author | Gerald Combs <gerald@wireshark.org> | 2015-08-18 11:46:12 -0700 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2015-08-20 23:12:37 +0000 |
commit | 2ed3d91b45332a2cbb4114b61f18c80fb28a6840 (patch) | |
tree | 1c37bec81ce931d54d8e0a3f59812dcdfe9c505f /epan/dissectors/packet-ieee80211.h | |
parent | 0f9bbbc6f7146747841760102a74efb96161ad99 (diff) |
Add the WLAN statistics dialog.
Instead of splitting the stats into two lists as with the GTK+ UI, add
everything to an expandable tree. This allows viewing nodes on more than
one network.
Rename the top-level Bluetooth menu item to Wireless and put the WLAN
stats dialog there.
The Qt UI matches SSIDs (WlanNetworkTreeWidgetItem::isMatch) a bit
differently than the GTK+ UI. Try to make the logic as plain as possible
since we'll likely have to update it in the future.
The addition of a custom BSSID address types means that we can't assume
that everything is AT_ETHER. Add routines for checking for broadcast
BSSIDs and comparing only the data portions of addresses.
Move PercentBarDelegate into its own module. Use it in
WlanStatisticsDialog.
Change-Id: Ie4214eb00671a890871380c4a07213ebfb7585c6
Reviewed-on: https://code.wireshark.org/review/10171
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'epan/dissectors/packet-ieee80211.h')
-rw-r--r-- | epan/dissectors/packet-ieee80211.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/epan/dissectors/packet-ieee80211.h b/epan/dissectors/packet-ieee80211.h index df63bf2e77..93fa7fcf89 100644 --- a/epan/dissectors/packet-ieee80211.h +++ b/epan/dissectors/packet-ieee80211.h @@ -27,6 +27,10 @@ #include "ws_symbol_export.h" +#ifdef __cplusplus +extern "C" { +#endif /* __cplusplus */ + WS_DLL_PUBLIC void capture_ieee80211 (const guchar *, int, int, packet_counts *); void capture_ieee80211_datapad (const guchar *, int, int, packet_counts *); @@ -65,6 +69,13 @@ WS_DLL_PUBLIC const float ieee80211_float_htrates[MAX_MCS_INDEX+1][2][2]; WS_DLL_PUBLIC value_string_ext ieee80211_supported_rates_vals_ext; +WS_DLL_PUBLIC +gboolean is_broadcast_bssid(const address *bssid); + +#ifdef __cplusplus +} +#endif /* __cplusplus */ + /* * Extract the protocol version from the frame control field */ @@ -225,12 +236,12 @@ WS_DLL_PUBLIC value_string_ext ieee80211_supported_rates_vals_ext; */ #define EXTENSION_DMG_BEACON 0x30 /* Extension DMG beacon */ -struct _wlan_stats { +typedef struct _wlan_stats { guint8 channel; guint8 ssid_len; guchar ssid[MAX_SSID_LEN]; gchar protection[MAX_PROTECT_LEN]; -}; +} wlan_stats_t; typedef struct _wlan_hdr { address bssid; @@ -238,7 +249,7 @@ typedef struct _wlan_hdr { address dst; guint16 type; struct _wlan_stats stats; -} wlan_hdr; +} wlan_hdr_t; #define WLANCAP_MAGIC_COOKIE_BASE 0x80211000 #define WLANCAP_MAGIC_COOKIE_V1 0x80211001 |