diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-07-02 11:25:59 -0700 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-07-02 18:26:27 +0000 |
| commit | 622be70534fb8333abbd0ecda20b68bdd0a5e917 (patch) | |
| tree | a4a0f78289755820d84896fb974edc3588b127b2 | |
| parent | cd6977221afb9bd0c77aee848c8be1d647d66259 (diff) | |
| download | wireshark-622be70534fb8333abbd0ecda20b68bdd0a5e917.tar.gz | |
Zero out the nss array when we don't have the 802.11ac information we need.
Change-Id: I576be8c1a1badf6befe90a226f83e8d03f8326a7
Reviewed-on: https://code.wireshark.org/review/9470
Reviewed-by: Guy Harris <guy@alum.mit.edu>
| -rw-r--r-- | epan/dissectors/packet-ixveriwave.c | 3 | ||||
| -rw-r--r-- | wiretap/peektagged.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/epan/dissectors/packet-ixveriwave.c b/epan/dissectors/packet-ixveriwave.c index 7808bc1f38..54d8703cc7 100644 --- a/epan/dissectors/packet-ixveriwave.c +++ b/epan/dissectors/packet-ixveriwave.c @@ -653,6 +653,7 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree guint8 mcs_index; guint8 ness; float phyRate; + guint i; proto_tree *vweft, *vw_errorFlags_tree = NULL, *vwift,*vw_infoFlags_tree = NULL; guint16 vw_flags, vw_chanflags, vw_info, vw_ht_length, vw_rflags; @@ -730,6 +731,8 @@ wlantap_dissect(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, proto_tree phdr.phy_info.info_11ac.presence_flags = PHDR_802_11AC_HAS_SHORT_GI; phdr.phy_info.info_11ac.short_gi = ((vw_rflags & FLAGS_CHAN_SHORTGI) != 0); + for (i = 0; i < 4; i++) + phdr.phy_info.info_11ac.nss[i] = 0; } else { phdr.phy = PHDR_802_11_PHY_11N; phdr.phy_info.info_11n.presence_flags = diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c index c6b2d357f3..b20aded4d9 100644 --- a/wiretap/peektagged.c +++ b/wiretap/peektagged.c @@ -435,6 +435,7 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, gint channel; guint frequency; struct ieee_802_11_phdr ieee_802_11; + guint i; int skip_len = 0; guint64 t; @@ -613,6 +614,8 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr, if (ext_flags & EXT_FLAG_802_11ac) { ieee_802_11.phy = PHDR_802_11_PHY_11AC; ieee_802_11.phy_info.info_11ac.presence_flags = 0; + for (i = 0; i < 4; i++) + ieee_802_11.phy_info.info_11ac.nss[i] = 0; switch (ext_flags & EXT_FLAGS_GI) { |