diff options
Diffstat (limited to 'epan/dissectors/packet-wifi-display.c')
| -rw-r--r-- | epan/dissectors/packet-wifi-display.c | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/epan/dissectors/packet-wifi-display.c b/epan/dissectors/packet-wifi-display.c index b2123e6e..bf40fcf4 100644 --- a/epan/dissectors/packet-wifi-display.c +++ b/epan/dissectors/packet-wifi-display.c @@ -18,72 +18,72 @@ void proto_register_wifi_display(void); void proto_reg_handoff_wifi_display(void); -static int proto_wifi_display = -1; - -static int hf_wfd_subelem_id = -1; -static int hf_wfd_subelem_len = -1; - -static int hf_wfd_subelem_dev_info_type = -1; -static int hf_wfd_subelem_dev_info_coupled_sink_source = -1; -static int hf_wfd_subelem_dev_info_coupled_sink_sink = -1; -static int hf_wfd_subelem_dev_info_available = -1; -static int hf_wfd_subelem_dev_info_wsd = -1; -static int hf_wfd_subelem_dev_info_pc = -1; -static int hf_wfd_subelem_dev_info_content_protection = -1; -static int hf_wfd_subelem_dev_info_time_sync = -1; -static int hf_wfd_subelem_dev_info_control_port = -1; -static int hf_wfd_subelem_dev_info_max_throughput = -1; -static int hf_wfd_subelem_dev_info_audio_unsupp_pri_sink = -1; -static int hf_wfd_subelem_dev_info_audio_only_supp_source = -1; -static int hf_wfd_subelem_dev_info_tdls_persistent_group = -1; -static int hf_wfd_subelem_dev_info_tdls_persistent_group_reinvoke = -1; -static int hf_wfd_subelem_dev_info_reserved = -1; - -static int hf_wfd_subelem_assoc_bssid = -1; - -static int hf_wfd_subelem_coupled_sink_status_bitmap = -1; -static int hf_wfd_subelem_coupled_sink_reserved = -1; -static int hf_wfd_subelem_coupled_sink_mac_addr = -1; - -static int hf_wfd_subelem_session_descr_len = -1; -static int hf_wfd_subelem_session_dev_addr = -1; -static int hf_wfd_subelem_session_assoc_bssid = -1; -static int hf_wfd_subelem_session_dev_info_type = -1; -static int hf_wfd_subelem_session_dev_info_coupled_sink_source = -1; -static int hf_wfd_subelem_session_dev_info_coupled_sink_sink = -1; -static int hf_wfd_subelem_session_dev_info_available = -1; -static int hf_wfd_subelem_session_dev_info_wsd = -1; -static int hf_wfd_subelem_session_dev_info_pc = -1; -static int hf_wfd_subelem_session_dev_info_content_protection = -1; -static int hf_wfd_subelem_session_dev_info_time_sync = -1; -static int hf_wfd_subelem_session_dev_info_audio_unsupp_pri_sink = -1; -static int hf_wfd_subelem_session_dev_info_audio_only_supp_source = -1; -static int hf_wfd_subelem_session_dev_info_tdls_persistent_group = -1; -static int hf_wfd_subelem_session_dev_info_tdls_persistent_group_reinvoke = -1; -static int hf_wfd_subelem_session_dev_info_reserved = -1; -static int hf_wfd_subelem_session_dev_info_max_throughput = -1; -static int hf_wfd_subelem_session_coupled_sink_status_bitmap = -1; -static int hf_wfd_subelem_session_coupled_sink_reserved = -1; -static int hf_wfd_subelem_session_coupled_sink_addr = -1; -static int hf_wfd_subelem_session_extra_info = -1; - -static int hf_wfd_subelem_ext_capab = -1; -static int hf_wfd_subelem_ext_capab_uibc = -1; -static int hf_wfd_subelem_ext_capab_i2c_read_write = -1; -static int hf_wfd_subelem_ext_capab_preferred_display_mode = -1; -static int hf_wfd_subelem_ext_capab_standby_resume_control = -1; -static int hf_wfd_subelem_ext_capab_tdls_persistent = -1; -static int hf_wfd_subelem_ext_capab_tdls_persistent_bssid = -1; -static int hf_wfd_subelem_ext_capab_reserved = -1; - -static int hf_wfd_subelem_alt_mac_addr = -1; - -static gint ett_wfd_subelem = -1; -static gint ett_wfd_dev_info_descr = -1; - -static expert_field ei_wfd_subelem_len_invalid = EI_INIT; -static expert_field ei_wfd_subelem_session_descr_invalid = EI_INIT; -static expert_field ei_wfd_subelem_id = EI_INIT; +static int proto_wifi_display; + +static int hf_wfd_subelem_id; +static int hf_wfd_subelem_len; + +static int hf_wfd_subelem_dev_info_type; +static int hf_wfd_subelem_dev_info_coupled_sink_source; +static int hf_wfd_subelem_dev_info_coupled_sink_sink; +static int hf_wfd_subelem_dev_info_available; +static int hf_wfd_subelem_dev_info_wsd; +static int hf_wfd_subelem_dev_info_pc; +static int hf_wfd_subelem_dev_info_content_protection; +static int hf_wfd_subelem_dev_info_time_sync; +static int hf_wfd_subelem_dev_info_control_port; +static int hf_wfd_subelem_dev_info_max_throughput; +static int hf_wfd_subelem_dev_info_audio_unsupp_pri_sink; +static int hf_wfd_subelem_dev_info_audio_only_supp_source; +static int hf_wfd_subelem_dev_info_tdls_persistent_group; +static int hf_wfd_subelem_dev_info_tdls_persistent_group_reinvoke; +static int hf_wfd_subelem_dev_info_reserved; + +static int hf_wfd_subelem_assoc_bssid; + +static int hf_wfd_subelem_coupled_sink_status_bitmap; +static int hf_wfd_subelem_coupled_sink_reserved; +static int hf_wfd_subelem_coupled_sink_mac_addr; + +static int hf_wfd_subelem_session_descr_len; +static int hf_wfd_subelem_session_dev_addr; +static int hf_wfd_subelem_session_assoc_bssid; +static int hf_wfd_subelem_session_dev_info_type; +static int hf_wfd_subelem_session_dev_info_coupled_sink_source; +static int hf_wfd_subelem_session_dev_info_coupled_sink_sink; +static int hf_wfd_subelem_session_dev_info_available; +static int hf_wfd_subelem_session_dev_info_wsd; +static int hf_wfd_subelem_session_dev_info_pc; +static int hf_wfd_subelem_session_dev_info_content_protection; +static int hf_wfd_subelem_session_dev_info_time_sync; +static int hf_wfd_subelem_session_dev_info_audio_unsupp_pri_sink; +static int hf_wfd_subelem_session_dev_info_audio_only_supp_source; +static int hf_wfd_subelem_session_dev_info_tdls_persistent_group; +static int hf_wfd_subelem_session_dev_info_tdls_persistent_group_reinvoke; +static int hf_wfd_subelem_session_dev_info_reserved; +static int hf_wfd_subelem_session_dev_info_max_throughput; +static int hf_wfd_subelem_session_coupled_sink_status_bitmap; +static int hf_wfd_subelem_session_coupled_sink_reserved; +static int hf_wfd_subelem_session_coupled_sink_addr; +static int hf_wfd_subelem_session_extra_info; + +static int hf_wfd_subelem_ext_capab; +static int hf_wfd_subelem_ext_capab_uibc; +static int hf_wfd_subelem_ext_capab_i2c_read_write; +static int hf_wfd_subelem_ext_capab_preferred_display_mode; +static int hf_wfd_subelem_ext_capab_standby_resume_control; +static int hf_wfd_subelem_ext_capab_tdls_persistent; +static int hf_wfd_subelem_ext_capab_tdls_persistent_bssid; +static int hf_wfd_subelem_ext_capab_reserved; + +static int hf_wfd_subelem_alt_mac_addr; + +static int ett_wfd_subelem; +static int ett_wfd_dev_info_descr; + +static expert_field ei_wfd_subelem_len_invalid; +static expert_field ei_wfd_subelem_session_descr_invalid; +static expert_field ei_wfd_subelem_id; static dissector_handle_t wifi_display_ie_handle; @@ -218,14 +218,14 @@ dissect_wfd_subelem_coupled_sink(packet_info *pinfo, proto_tree *tree, static void dissect_wfd_subelem_session_info(packet_info *pinfo, proto_tree *tree, - tvbuff_t *tvb, int offset, guint16 len) + tvbuff_t *tvb, int offset, uint16_t len) { int end = offset + len, next; proto_item *item; proto_tree *descr; while (offset < end) { - guint8 dlen = tvb_get_guint8(tvb, offset); + uint8_t dlen = tvb_get_uint8(tvb, offset); next = offset + 1 + dlen; descr = proto_tree_add_subtree(tree, tvb, offset, 1 + dlen, @@ -353,8 +353,8 @@ dissect_wifi_display_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, { int end = tvb_reported_length(tvb); int offset = 0; - guint8 id; - guint16 len; + uint8_t id; + uint16_t len; proto_tree *wfd_tree; proto_item *subelem; @@ -364,7 +364,7 @@ dissect_wifi_display_ie(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, break; } - id = tvb_get_guint8(tvb, offset); + id = tvb_get_uint8(tvb, offset); len = tvb_get_ntohs(tvb, offset + 1); wfd_tree = proto_tree_add_subtree(tree, tvb, offset, 3 + len, ett_wfd_subelem, &subelem, @@ -605,7 +605,7 @@ proto_register_wifi_display(void) { "Alternative MAC Address", "wifi_display.subelem.alt_mac_addr", FT_ETHER, BASE_NONE, NULL, 0, NULL, HFILL }}, }; - static gint *ett[] = { + static int *ett[] = { &ett_wfd_subelem, &ett_wfd_dev_info_descr }; |