diff --git a/README.macos b/README.macos index 791757a3fa..2059cfcf27 100644 --- a/README.macos +++ b/README.macos @@ -124,7 +124,7 @@ a Xcode project file in the current directory. If you upgrade the major release of macOS on which you are building Wireshark, we advise that, before you do any builds after the upgrade, -you remove the build directory and all its subdiretories, and repeat the +you remove the build directory and all its subdirectories, and repeat the above process, re-running CMake and rebuilding from scratch. On Snow Leopard (10.6) and later releases, if you are building on a diff --git a/epan/dissectors/packet-ieee80211.c b/epan/dissectors/packet-ieee80211.c index 986435c63d..07c08be59e 100644 --- a/epan/dissectors/packet-ieee80211.c +++ b/epan/dissectors/packet-ieee80211.c @@ -56679,7 +56679,7 @@ proto_register_ieee80211(void) {&hf_ieee80211_eht_ttl_expected_dura_pres, {"Expected Duration Present", - "wlan.eht.tid_to_link_mapping.control.expteced_duration", + "wlan.eht.tid_to_link_mapping.control.expected_duration", FT_BOOLEAN, 8, NULL, 0x10, NULL, HFILL }}, {&hf_ieee80211_eht_ttl_link_mapping_size, @@ -56805,39 +56805,39 @@ proto_register_ieee80211(void) FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_max_msdu_size, - {"Maximum MSDU Size", "wlan.eht.qos_chracteristics.max_msdu_size", + {"Maximum MSDU Size", "wlan.eht.qos_characteristics.max_msdu_size", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_service_start_time, - {"Service Start Time", "wlan.eht.qos_chracteristics.service_start_time", + {"Service Start Time", "wlan.eht.qos_characteristics.service_start_time", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_service_start_time_linkid, - {"Service Start Time LinkID", "wlan.eht.qos_chracteristics.service_start_time_linkid", + {"Service Start Time LinkID", "wlan.eht.qos_characteristics.service_start_time_linkid", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_mean_data_rate, - {"Mean Data Rate", "wlan.eht.qos_chracteristics.mean_data_rate", + {"Mean Data Rate", "wlan.eht.qos_characteristics.mean_data_rate", FT_UINT24, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_burst_size, - {"Burst Size", "wlan.eht.qos_chracteristics.burst_size", + {"Burst Size", "wlan.eht.qos_characteristics.burst_size", FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_msdu_lifetime, - {"MSDU Lifetime", "wlan.eht.qos_chracteristics.msdu_lifetime", + {"MSDU Lifetime", "wlan.eht.qos_characteristics.msdu_lifetime", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_msdu_delivery_ratio, - {"MSDU Delivery Ratio", "wlan.eht.qos_chracteristics.msdu_delivery_ratio", + {"MSDU Delivery Ratio", "wlan.eht.qos_characteristics.msdu_delivery_ratio", FT_UINT8, BASE_DEC, NULL, 0x0f, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_msdu_count_exponent, - {"MSDU Count Exponent", "wlan.eht.qos_chracteristics.msdu_count_exponent", + {"MSDU Count Exponent", "wlan.eht.qos_characteristics.msdu_count_exponent", FT_UINT8, BASE_DEC, NULL, 0xf0, NULL, HFILL }}, {&hf_ieee80211_eht_qos_chars_medium_time, - {"Medium Time", "wlan.eht.qos_chracteristics.medium_time", + {"Medium Time", "wlan.eht.qos_characteristics.medium_time", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, {&hf_ieee80211_eht_link_id_bitmap, diff --git a/epan/dissectors/packet-srt.c b/epan/dissectors/packet-srt.c index f0966ac922..7c7e713dbf 100644 --- a/epan/dissectors/packet-srt.c +++ b/epan/dissectors/packet-srt.c @@ -92,7 +92,7 @@ static int hf_srt_srths_peer_latency = -1; // TSBPD delay static int hf_srt_srtkm_msg = -1; static int hf_srt_srtkm_error = -1; static int hf_srt_srths_sid = -1; -static int hf_srt_srths_conjestcontrol = -1; +static int hf_srt_srths_congestcontrol = -1; static gint ett_srt = -1; static gint ett_srt_handshake_ext_flags = -1; @@ -195,7 +195,7 @@ enum UDTMessageType #define SRT_CMD_KMREQ 3 #define SRT_CMD_KMRSP 4 #define SRT_CMD_SID 5 -#define SRT_CMD_CONJESTCTRL 6 +#define SRT_CMD_CONGESTCTRL 6 enum SrtDataStruct { @@ -249,7 +249,7 @@ static const value_string srt_ctrlmsg_exttypes[] = { {SRT_CMD_KMREQ, "SRT_CMD_KMREQ"}, {SRT_CMD_KMRSP, "SRT_CMD_KMRSP"}, {SRT_CMD_SID, "SRT_CMD_SID"}, - {SRT_CMD_CONJESTCTRL, "SRT_CMD_CONJESTCTRL"}, + {SRT_CMD_CONGESTCTRL, "SRT_CMD_CONGESTCTRL"}, { 0, NULL }, }; @@ -682,8 +682,8 @@ dissect_srt_control_packet(tvbuff_t *tvb, packet_info* pinfo, format_text_reorder_32(tree, tvb, hf_srt_srths_sid, begin, 4 * blocklen); break; - case SRT_CMD_CONJESTCTRL: - format_text_reorder_32(tree, tvb, hf_srt_srths_conjestcontrol, begin, 4 * blocklen); + case SRT_CMD_CONGESTCTRL: + format_text_reorder_32(tree, tvb, hf_srt_srths_congestcontrol, begin, 4 * blocklen); break; default: @@ -1226,8 +1226,8 @@ void proto_register_srt(void) FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}}, - {&hf_srt_srths_conjestcontrol, { - "Congestion Control Type", "srt.hs.conjestctrl", + {&hf_srt_srths_congestcontrol, { + "Congestion Control Type", "srt.hs.congestctrl", FT_STRING, BASE_NONE, NULL, 0, NULL, HFILL}} }; diff --git a/tools/wireshark_words.txt b/tools/wireshark_words.txt index 29ab09921f..9c3bbddca2 100644 --- a/tools/wireshark_words.txt +++ b/tools/wireshark_words.txt @@ -240,6 +240,7 @@ claypaky clientkey clientout clopts +clsfr cmake cmdcontrol cmstatus @@ -407,6 +408,7 @@ dfsauth dftest dgotyp dgram +dhaka dhcpv dialed dialup @@ -981,6 +983,7 @@ nrppa nrtcws nsapi nssai +nssvc nstime nstrace ntlmssp @@ -1492,6 +1495,7 @@ synchronizer synchronizing synchronously syncman +syniverse synphasor syntaxes sysdig