Bugfix SGI Nsym disambiguation is unconditionally displayed when dissecting VHT,...

From Karl Beldan

BACKPORT(1.8,1.10)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@51422 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index fac0672e3fc3623fabe088ec6ade3a102c36103f..ce6de6b51a0adf7ae7df813057c1bf0fc2dec2df 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -3758,7 +3758,7 @@ Linas Vepstas             <linasvepstas[AT]gmail.com>
 Simon Zhong                    <szhong[AT]juniper.net>
 Bart Van Assche                <bvanassche[AT]acm.org>
 Peter Lemenkov         <lemenkov[AT]gmail.com>
-
+Karl Beldan                    <karl.beldan[AT]gmail.com>
 
 Dan Lasley <dlasley[AT]promus.com> gave permission for his
 dumpit() hex-dump routine to be used.

diff --git a/epan/dissectors/packet-ieee80211-radiotap.c b/epan/dissectors/packet-ieee80211-radiotap.c
index 529ff4b206bf3753a6a5a086712ee2972989896b..cabe5be6f14f58f71d2eb8148233ce6730ba42e6 100644 (file)
--- a/epan/dissectors/packet-ieee80211-radiotap.c
+++ b/epan/dissectors/packet-ieee80211-radiotap.c
@@ -1810,13 +1810,22 @@ dissect_radiotap(tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree)
                                if (vht_tree) {
                                        proto_tree_add_item(vht_tree, hf_radiotap_vht_gi,
                                                        tvb, offset + 2, 1, ENC_LITTLE_ENDIAN);
-                                       proto_tree_add_item(vht_tree, hf_radiotap_vht_sgi_nsym_da,
-                                                       tvb, offset + 2, 1, ENC_LITTLE_ENDIAN);
                                }
                        } else {
                                can_calculate_rate = FALSE;     /* no GI width */
                        }
 
+                       if (known & IEEE80211_RADIOTAP_VHT_HAVE_SGI_NSYM_DA) {
+                               if (vht_tree) {
+                                       it = proto_tree_add_item(vht_tree, hf_radiotap_vht_sgi_nsym_da,
+                                                       tvb, offset + 2, 1, ENC_LITTLE_ENDIAN);
+                                       if ((flags & IEEE80211_RADIOTAP_VHT_SGI_NSYM_DA) &&
+                                               (known & IEEE80211_RADIOTAP_VHT_HAVE_GI) &&
+                                               !(flags & IEEE80211_RADIOTAP_VHT_SGI))
+                                               proto_item_append_text(it, " (invalid)");
+                               }
+                       }
+
                        if (known & IEEE80211_RADIOTAP_VHT_HAVE_LDPC_EXTRA) {
                                if (vht_tree) {
                                        proto_tree_add_item(vht_tree, hf_radiotap_vht_ldpc_extra,