summaryrefslogtreecommitdiff
path: root/ui/gtk/wlan_stat_dlg.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2015-07-08 22:59:03 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2015-07-10 06:01:31 +0000
commit4da081b0d5a2a00011da633400b456296c39ddb3 (patch)
tree67222510bcec1519ad6def4356cb3e06491fbdb8 /ui/gtk/wlan_stat_dlg.c
parentf6a482656b0b0931e72136565980bed04db45c31 (diff)
downloadwireshark-4da081b0d5a2a00011da633400b456296c39ddb3.tar.gz
IEEE 802.11: tap all packets
And only take into account management, non null data and or extension frames in WLAN traffic statistics, as previously Bug: 11318 Change-Id: I32c059a2594331c4e317380b9de43fb582f7f8cb Reviewed-on: https://code.wireshark.org/review/9566 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'ui/gtk/wlan_stat_dlg.c')
-rw-r--r--ui/gtk/wlan_stat_dlg.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/gtk/wlan_stat_dlg.c b/ui/gtk/wlan_stat_dlg.c
index 8b92c3e8fe..672c672813 100644
--- a/ui/gtk/wlan_stat_dlg.c
+++ b/ui/gtk/wlan_stat_dlg.c
@@ -386,10 +386,17 @@ wlanstat_packet (void *phs, packet_info *pinfo, epan_dissect_t *edt _U_, const v
wlanstat_t *hs = (wlanstat_t *)phs;
wlan_ep_t *tmp, *te = NULL;
const struct _wlan_hdr *si = (const struct _wlan_hdr *) phi;
+ guint16 frame_type = si->type & 0xff0;
if (!hs)
return (0);
+ if (!((frame_type == 0x0) || (frame_type == 0x20) || (frame_type == 0x30))
+ || ((frame_type == 0x20) && DATA_FRAME_IS_NULL(si->type))) {
+ /* Not a management or non null data or extension frame; let's skip it */
+ return (0);
+ }
+
hs->number_of_packets++;
if (!hs->ep_list) {
hs->ep_list = alloc_wlan_ep (si, pinfo);