aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJaap Keuter <jaap.keuter@xs4all.nl>2019-12-27 17:30:43 +0100
committerMichael Mann <mmann78@netscape.net>2019-12-28 14:00:04 +0000
commitfe9ee2c9b9bd7d0ecd21bd13c63d7cf453d270d5 (patch)
tree44bd5365b7c920f42b80c5350924981106121530 /tools
parent17492b8a6b21dad6295fcaf7800ceea2788c76a6 (diff)
netlink: update 802.11 related netlink messages Linux kernel v5.4
Taking the Linux kernel v5.4 uapi/linux/nl80211.h file: - Sort the enums in the generation script according to the header file to make incremental maintenance easier. - Add listing of all additional enums found in the header file. - Update the generated netlink dissector code for 802.11. Change-Id: I9d2dc09d58d8f252d4746e662e4133d47a7525c5 Reviewed-on: https://code.wireshark.org/review/35570 Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'tools')
-rwxr-xr-xtools/generate-nl80211-fields.py114
1 files changed, 78 insertions, 36 deletions
diff --git a/tools/generate-nl80211-fields.py b/tools/generate-nl80211-fields.py
index 120b579129..e2f47d59b8 100755
--- a/tools/generate-nl80211-fields.py
+++ b/tools/generate-nl80211-fields.py
@@ -32,64 +32,106 @@ EXPORT_ENUMS = {
'nl80211_attrs': (None, None, None),
'nl80211_iftype': (None, None, None),
'nl80211_sta_flags': (None, None, None),
+ 'nl80211_sta_p2p_ps_status': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_he_gi': (None, None, None),
+ 'nl80211_he_ru_alloc': (None, None, None),
'nl80211_rate_info': (None, None, None),
'nl80211_sta_bss_param': (None, None, None),
'nl80211_sta_info': (None, None, None),
'nl80211_tid_stats': (None, None, None),
- 'nl80211_mpath_info': (None, None, None),
- 'nl80211_mntr_flags': (None, None, None),
- 'nl80211_bss': (None, None, None),
- 'nl80211_key_attributes': (None, None, None),
- 'nl80211_survey_info': (None, None, None),
- 'nl80211_frequency_attr': (None, None, None),
- 'nl80211_tx_rate_attributes': (None, None, None),
- 'nl80211_attr_cqm': (None, None, None),
- 'nl80211_key_default_types': (None, None, None),
- 'nl80211_mesh_setup_params': (None, None, None),
- 'nl80211_meshconf_params': (None, None, None),
- 'nl80211_if_combination_attrs': (None, None, None),
- 'nl80211_rekey_data': (None, None, None),
- 'nl80211_sta_wme_attr': (None, None, None),
- 'nl80211_pmksa_candidate_attr': (None, None, None),
- 'nl80211_sched_scan_plan': (None, None, None),
- 'nl80211_bss_select_attr': (None, None, None),
- 'nl80211_nan_func_attributes': (None, None, None),
- 'nl80211_nan_match_attributes': (None, None, None),
'nl80211_txq_stats': (None, None, None),
+ 'nl80211_mpath_flags': (None, None, None),
+ 'nl80211_mpath_info': (None, None, None),
+ 'nl80211_band_iftype_attr': (None, None, None),
'nl80211_band_attr': (None, None, None),
+ 'nl80211_wmm_rule': (None, None, None),
+ 'nl80211_frequency_attr': (None, None, None),
'nl80211_bitrate_attr': (None, None, None),
+ 'nl80211_reg_initiator': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_reg_type': ('Attribute Value', 'FT_UINT8', None),
'nl80211_reg_rule_attr': (None, None, None),
- 'nl80211_txq_attr': (None, None, None),
- 'nl80211_band_iftype_attr': (None, None, None),
- 'nl80211_dfs_state': (None, None, None),
- 'nl80211_wmm_rule': (None, None, None),
- 'nl80211_txq_stats': (None, None, None),
'nl80211_sched_scan_match_attr': (None, None, None),
- 'nl80211_chan_width': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_reg_rule_flags': (None, None, None),
+ 'nl80211_dfs_regions': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_user_reg_hint_type': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_survey_info': (None, None, None),
+ 'nl80211_mntr_flags': (None, None, None),
+ 'nl80211_mesh_power_mode': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_meshconf_params': (None, None, None),
+ 'nl80211_mesh_setup_params': (None, None, None),
+ 'nl80211_txq_attr': (None, None, None),
+ 'nl80211_ac': (None, None, None),
'nl80211_channel_type': ('Attribute Value', 'FT_UINT32', None),
- 'plink_actions': ('Attribute Value', 'FT_UINT8', None),
- 'nl80211_reg_initiator': ('Attribute Value', 'FT_UINT8', None),
- 'nl80211_reg_type': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_key_mode': (None, None, None),
+ 'nl80211_chan_width': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_bss_scan_width': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_bss': (None, None, None),
+ 'nl80211_bss_status': ('Attribute Value', 'FT_UINT32', None),
'nl80211_auth_type': ('Attribute Value', 'FT_UINT32', None),
'nl80211_key_type': ('Attribute Value', 'FT_UINT32', None),
- 'nl80211_bss_status': ('Attribute Value', 'FT_UINT32', None),
- 'nl80211_bss_scan_width': ('Attribute Value', 'FT_UINT32', None),
'nl80211_mfp': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_wpa_versions': (None, None, None),
+ 'nl80211_key_default_types': (None, None, None),
+ 'nl80211_key_attributes': (None, None, None),
+ 'nl80211_tx_rate_attributes': (None, None, None),
+ 'nl80211_txrate_gi': (None, None, None),
+ 'nl80211_band': (None, None, None),
'nl80211_ps_state': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_attr_cqm': (None, None, None),
+ 'nl80211_cqm_rssi_threshold_event': (None, None, None),
'nl80211_tx_power_setting': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_packet_pattern_attr': (None, None, None),
+ 'nl80211_wowlan_triggers': (None, None, None),
+ 'nl80211_wowlan_tcp_attrs': (None, None, None),
+ 'nl80211_attr_coalesce_rule': (None, None, None),
+ 'nl80211_coalesce_condition': (None, None, None),
+ 'nl80211_iface_limit_attrs': (None, None, None),
+ 'nl80211_if_combination_attrs': (None, None, None),
'nl80211_plink_state': ('Attribute Value', 'FT_UINT8', None),
+ 'plink_actions': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_rekey_data': (None, None, None),
+ 'nl80211_hidden_ssid': (None, None, None),
+ 'nl80211_sta_wme_attr': (None, None, None),
+ 'nl80211_pmksa_candidate_attr': (None, None, None),
'nl80211_tdls_operation': ('Attribute Value', 'FT_UINT8', None),
- 'nl80211_user_reg_hint_type': ('Attribute Value', 'FT_UINT32', None),
+ #Reserved for future use 'nl80211_ap_sme_features': (None, None, None),
+ 'nl80211_feature_flags': (None, None, None),
+ 'nl80211_ext_feature_index': (None, None, None),
+ 'nl80211_probe_resp_offload_support_attr': (None, None, None),
'nl80211_connect_failed_reason': ('Attribute Value', 'FT_UINT32', None),
- 'nl80211_mesh_power_mode': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_timeout_reason': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_scan_flags': (None, None, None),
'nl80211_acl_policy': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_smps_mode': ('Attribute Value', 'FT_UINT8', None),
'nl80211_radar_event': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_dfs_state': (None, None, None),
+ 'nl80211_protocol_features': (None, None, None),
'nl80211_crit_proto_id': ('Attribute Value', 'FT_UINT16', None),
- 'nl80211_smps_mode': ('Attribute Value', 'FT_UINT8', None),
- 'nl80211_sta_p2p_ps_status': ('Attribute Value', 'FT_UINT8', None),
- 'nl80211_timeout_reason': ('Attribute Value', 'FT_UINT32', None),
+ 'nl80211_rxmgmt_flags': (None, None, None),
+ 'nl80211_tdls_peer_capability': (None, None, None),
+ 'nl80211_sched_scan_plan': (None, None, None),
+ 'nl80211_bss_select_attr': (None, None, None),
+ 'nl80211_nan_function_type': (None, None, None),
+ 'nl80211_nan_publish_type': (None, None, None),
+ 'nl80211_nan_func_term_reason': (None, None, None),
+ 'nl80211_nan_func_attributes': (None, None, None),
+ 'nl80211_nan_srf_attributes': (None, None, None),
+ 'nl80211_nan_match_attributes': (None, None, None),
'nl80211_external_auth_action': ('Attribute Value', 'FT_UINT32', None),
- 'nl80211_dfs_regions': ('Attribute Value', 'FT_UINT8', None),
+ 'nl80211_ftm_responder_attributes': (None, None, None),
+ 'nl80211_ftm_responder_stats': (None, None, None),
+ 'nl80211_preamble': (None, None, None),
+ 'nl80211_peer_measurement_type': (None, None, None),
+ 'nl80211_peer_measurement_status': (None, None, None),
+ 'nl80211_peer_measurement_req': (None, None, None),
+ 'nl80211_peer_measurement_resp': (None, None, None),
+ 'nl80211_peer_measurement_peer_attrs': (None, None, None),
+ 'nl80211_peer_measurement_attrs': (None, None, None),
+ 'nl80211_peer_measurement_ftm_capa': (None, None, None),
+ 'nl80211_peer_measurement_ftm_req': (None, None, None),
+ 'nl80211_peer_measurement_ftm_failure_reasons': (None, None, None),
+ 'nl80211_peer_measurement_ftm_resp': (None, None, None),
+ 'nl80211_obss_pd_attributes': (None, None, None),
}
# File to be patched
SOURCE_FILE = "epan/dissectors/packet-netlink-nl80211.c"