Wireshark-dev: Re: [Wireshark-dev] Nameclash in ieee80211 RM Report

From: Dario Lombardo <lomato@xxxxxxxxx>
Date: Wed, 18 Sep 2019 21:02:58 +0200
Hi
Patches in wireshark go through gerrit.
You can find how here

https://www.wireshark.org/docs/wsdg_html_chunked/ChSrcContribute.html

Feel free to ask for more help if needed.
Dario.

On Wed, Sep 18, 2019, 20:55 Aleksej Matis <amat@xxxxxxxxx> wrote:
Hi,

while working on a project involving wireshark I have found a nameclash
between the IEEE802.11 RM Report fields channel number and duration.
In both cases the abbreviation "wlan.measure.rep.channelnumber" was
used. I think "wlan.measure.rep.duration" would be the correct way to
go.

Please find my proposed patch below.
I'm new to this project, feedback is welcome.

Best Regards,
Aleksej

==================

commit f65570980d350785e634e4e8c9ef3bc2c15fb0b5
Author: Aleksej Matis <amat@xxxxxxxxx>
Date:   Wed Sep 18 20:39:06 2019 +0200

    ieee80211: Fix nameclash in RM Report

    RM Report channel number and duration share the same abbreviation.
    Rename duration to wlan.measure.re[qp].duration.

diff --git a/epan/dissectors/packet-ieee80211.c
b/epan/dissectors/packet-ieee80211.c
index 14d6a661e7..50369f7707 100644
--- a/epan/dissectors/packet-ieee80211.c
+++ b/epan/dissectors/packet-ieee80211.c
@@ -32467,7 +32467,7 @@ proto_register_ieee80211(void)
       NULL, HFILL }},

     {&hf_ieee80211_tag_measure_request_duration,
-     {"Measurement Duration", "wlan.measure.req.channelnumber",
+     {"Measurement Duration", "wlan.measure.req.duration",
       FT_UINT16, BASE_HEX, NULL, 0,
       "in TU (1 TU = 1024 us)", HFILL }},

@@ -32634,7 +32634,7 @@ proto_register_ieee80211(void)
       NULL, HFILL }},

     {&hf_ieee80211_tag_measure_report_duration,
-     {"Measurement Duration", "wlan.measure.rep.channelnumber",
+     {"Measurement Duration", "wlan.measure.rep.duration",
       FT_UINT16, BASE_HEX, NULL, 0,
       NULL, HFILL }},


___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev@xxxxxxxxxxxxx>
Archives:    https://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://www.wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request@xxxxxxxxxxxxx?subject=unsubscribe