Fixup: tvb_get_string(z) -> tvb_get_string(z)_enc
[metze/wireshark/wip.git] / epan / dissectors / packet-wifi-p2p.c
1 /* packet-wifi-p2p.c
2  *
3  * Wi-Fi P2P
4  *
5  * Copyright 2009-2010 Atheros Communications
6  *
7  * This program is free software; you can redistribute it and/or
8  * modify it under the terms of the GNU General Public License
9  * as published by the Free Software Foundation; either version 2
10  * of the License, or (at your option) any later version.
11  *
12  * This program is distributed in the hope that it will be useful,
13  * but WITHOUT ANY WARRANTY; without even the implied warranty of
14  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
15  * GNU General Public License for more details.
16  *
17  * You should have received a copy of the GNU General Public License
18  * along with this program; if not, write to the Free Software
19  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20  */
21
22 #include "config.h"
23
24 #include <glib.h>
25 #include <epan/packet.h>
26 #include <epan/to_str.h>
27 #include <epan/expert.h>
28
29 #include "packet-ieee80211.h"
30
31 void proto_register_p2p(void);
32
33 enum {
34   P2P_ATTR_STATUS = 0,
35   P2P_ATTR_MINOR_REASON_CODE = 1,
36   P2P_ATTR_P2P_CAPABILITY = 2,
37   P2P_ATTR_P2P_DEVICE_ID = 3,
38   P2P_ATTR_GROUP_OWNER_INTENT = 4,
39   P2P_ATTR_CONFIGURATION_TIMEOUT = 5,
40   P2P_ATTR_LISTEN_CHANNEL = 6,
41   P2P_ATTR_P2P_GROUP_BSSID = 7,
42   P2P_ATTR_EXTENDED_LISTEN_TIMING = 8,
43   P2P_ATTR_INTENDED_P2P_INTERFACE_ADDRESS = 9,
44   P2P_ATTR_P2P_MANAGEABILITY = 10,
45   P2P_ATTR_CHANNEL_LIST = 11,
46   P2P_ATTR_NOTICE_OF_ABSENCE = 12,
47   P2P_ATTR_P2P_DEVICE_INFO = 13,
48   P2P_ATTR_P2P_GROUP_INFO = 14,
49   P2P_ATTR_P2P_GROUP_ID = 15,
50   P2P_ATTR_P2P_INTERFACE = 16,
51   P2P_ATTR_OPERATING_CHANNEL = 17,
52   P2P_ATTR_INVITATION_FLAGS = 18,
53   /* 19-220 Reserved */
54   P2P_ATTR_VENDOR_SPECIFIC = 221
55   /* 222-255 Reserved */
56 };
57
58 static const value_string p2p_attr_types[] = {
59   { P2P_ATTR_STATUS, "Status" },
60   { P2P_ATTR_MINOR_REASON_CODE, "Minor Reason Code" },
61   { P2P_ATTR_P2P_CAPABILITY, "P2P Capability" },
62   { P2P_ATTR_P2P_DEVICE_ID, "P2P Device ID" },
63   { P2P_ATTR_GROUP_OWNER_INTENT, "Group Owner Intent" },
64   { P2P_ATTR_CONFIGURATION_TIMEOUT, "Configuration Timeout" },
65   { P2P_ATTR_LISTEN_CHANNEL, "Listen Channel" },
66   { P2P_ATTR_P2P_GROUP_BSSID, "P2P Group BSSID" },
67   { P2P_ATTR_EXTENDED_LISTEN_TIMING, "Extended Listen Timing" },
68   { P2P_ATTR_INTENDED_P2P_INTERFACE_ADDRESS,
69     "Intended P2P Interface Address" },
70   { P2P_ATTR_P2P_MANAGEABILITY, "P2P Manageability" },
71   { P2P_ATTR_CHANNEL_LIST, "Channel List" },
72   { P2P_ATTR_NOTICE_OF_ABSENCE, "Notice of Absence" },
73   { P2P_ATTR_P2P_DEVICE_INFO, "P2P Device Info" },
74   { P2P_ATTR_P2P_GROUP_INFO, "P2P Group Info" },
75   { P2P_ATTR_P2P_GROUP_ID, "P2P Group ID" },
76   { P2P_ATTR_P2P_INTERFACE, "P2P Interface" },
77   { P2P_ATTR_OPERATING_CHANNEL, "Operating Channel" },
78   { P2P_ATTR_INVITATION_FLAGS, "Invitation Flags" },
79   { P2P_ATTR_VENDOR_SPECIFIC, "Vendor specific attribute" },
80   { 0, NULL }
81 };
82
83 #define P2P_DEV_CAPAB_SERVICE_DISCOVERY 0x01
84 #define P2P_DEV_CAPAB_P2P_CLIENT_DISCOVERABILITY 0x02
85 #define P2P_DEV_CAPAB_CONCURRENT_OPERATION 0x04
86 #define P2P_DEV_CAPAB_P2P_INFRASTRUCTURE_MANAGED 0x08
87 #define P2P_DEV_CAPAB_P2P_DEVICE_LIMIT 0x10
88 #define P2P_DEV_CAPAB_P2P_INVITATION_PROCEDURE 0x20
89
90 #define P2P_GROUP_CAPAB_P2P_GROUP_OWNER 0x01
91 #define P2P_GROUP_CAPAB_PERSISTENT_P2P_GROUP 0x02
92 #define P2P_GROUP_CAPAB_P2P_GROUP_LIMIT 0x04
93 #define P2P_GROUP_CAPAB_INTRA_BSS_DISTRIBUTION 0x08
94 #define P2P_GROUP_CAPAB_CROSS_CONNECTION 0x10
95 #define P2P_GROUP_CAPAB_PERSISTENT_RECONNECT 0x20
96 #define P2P_GROUP_CAPAB_GROUP_FORMATION 0x40
97
98 #define WPS_CONF_METH_USBA 0x0001
99 #define WPS_CONF_METH_ETHERNET 0x0002
100 #define WPS_CONF_METH_LABEL 0x0004
101 #define WPS_CONF_METH_DISPLAY 0x0008
102 #define WPS_CONF_METH_EXT_NFC_TOKEN 0x0010
103 #define WPS_CONF_METH_INT_NFC_TOKEN 0x0020
104 #define WPS_CONF_METH_NFC_INTERFACE 0x0040
105 #define WPS_CONF_METH_PUSHBUTTON 0x0080
106 #define WPS_CONF_METH_KEYPAD 0x0100
107
108 enum {
109   P2P_ACT_GO_NEG_REQ = 0,
110   P2P_ACT_GO_NEG_RESP = 1,
111   P2P_ACT_GO_NEG_CONF = 2,
112   P2P_ACT_INVITATION_REQ = 3,
113   P2P_ACT_INVITATION_RESP = 4,
114   P2P_ACT_DEV_DISC_REQ = 5,
115   P2P_ACT_DEV_DISC_RESP = 6,
116   P2P_ACT_PROV_DISC_REQ = 7,
117   P2P_ACT_PROV_DISC_RESP = 8
118 };
119
120 static const value_string p2p_public_action_subtypes[] = {
121   { P2P_ACT_GO_NEG_REQ, "GO Negotiation Request" },
122   { P2P_ACT_GO_NEG_RESP, "GO Negotiation Response" },
123   { P2P_ACT_GO_NEG_CONF, "GO Negotiation Confirmation" },
124   { P2P_ACT_INVITATION_REQ, "P2P Invitation Request" },
125   { P2P_ACT_INVITATION_RESP, "P2P Invitation Response" },
126   { P2P_ACT_DEV_DISC_REQ, "Device Discoverability Request" },
127   { P2P_ACT_DEV_DISC_RESP, "Device Discoverability Response" },
128   { P2P_ACT_PROV_DISC_REQ, "Provision Discovery Request" },
129   { P2P_ACT_PROV_DISC_RESP, "Provision Discovery Response" },
130   { 0, NULL }
131 };
132
133 enum {
134   P2P_ACT_NOA = 0,
135   P2P_ACT_P2P_PRESENCE_REQ = 1,
136   P2P_ACT_P2P_PRESENCE_RESP = 2,
137   P2P_ACT_GO_DISC_REQ = 3
138 };
139
140 static const value_string p2p_action_subtypes[] = {
141   { P2P_ACT_NOA, "Notice of Absence" },
142   { P2P_ACT_P2P_PRESENCE_REQ, "P2P Presence Request" },
143   { P2P_ACT_P2P_PRESENCE_RESP, "P2P Presence Response" },
144   { P2P_ACT_GO_DISC_REQ, "GO Discoverability Request" },
145   { 0, NULL }
146 };
147
148 enum {
149   P2P_STATUS_SUCCESS = 0,
150   P2P_FAIL_INFORMATION_CURRENTLY_UNAVAILABLE = 1,
151   P2P_FAIL_INCOMPATIBLE_PARAMETERS = 2,
152   P2P_FAIL_LIMIT_REACHED = 3,
153   P2P_FAIL_INVALID_PARAMETERS = 4,
154   P2P_FAIL_UNABLE_TO_ACCOMMODATE = 5,
155   P2P_FAIL_PREVIOUS_PROTOCOL_ERROR = 6,
156   P2P_FAIL_NO_COMMON_CHANNELS = 7,
157   P2P_FAIL_UNKNOWN_P2P_GROUP = 8,
158   P2P_FAIL_BOTH_DEVICES_GO = 9,
159   P2P_FAIL_INCOMPATIBLE_PROVISION_METHOD = 10,
160   P2P_FAIL_REJECTED_BY_USER = 11
161 };
162
163 static const value_string p2p_status_codes[] = {
164   { P2P_STATUS_SUCCESS, "Success" },
165   { P2P_FAIL_INFORMATION_CURRENTLY_UNAVAILABLE, "Fail; information is "
166     "currently unavailable" },
167   { P2P_FAIL_INCOMPATIBLE_PARAMETERS, "Fail; incompatible parameters" },
168   { P2P_FAIL_LIMIT_REACHED, "Fail; limit reached" },
169   { P2P_FAIL_INVALID_PARAMETERS, "Fail; invalid parameters" },
170   { P2P_FAIL_UNABLE_TO_ACCOMMODATE, "Fail; unable to accommodate request" },
171   { P2P_FAIL_PREVIOUS_PROTOCOL_ERROR, "Fail; previous protocol error, or "
172     "disruptive behavior" },
173   { P2P_FAIL_NO_COMMON_CHANNELS, "Fail; no common channels" },
174   { P2P_FAIL_UNKNOWN_P2P_GROUP, "Fail; unknown P2P Group" },
175   { P2P_FAIL_BOTH_DEVICES_GO, "Fail; both P2P Devices indicated an Intent of "
176     "15 in Group Owner Negotiation" },
177   { P2P_FAIL_INCOMPATIBLE_PROVISION_METHOD, "Fail; incompatible provisioning "
178     "method" },
179   { P2P_FAIL_REJECTED_BY_USER, "Fail; rejected by user" },
180   { 0, NULL }
181 };
182
183 enum {
184   P2P_MINOR_RESERVED = 0,
185   P2P_MINOR_DISCONNECT_DUE_TO_CROSS_CONNECTION = 1,
186   P2P_MINOR_DISCONNECT_DUE_TO_NOT_P2P_MANAGED = 2,
187   P2P_MINOR_DISCONNECT_DUE_TO_NO_COEXISTENCE = 3,
188   P2P_MINOR_DISCONNECT_DUE_TO_OUTSIDE_POLICY = 4
189 };
190
191 static const value_string p2p_minor_reason_codes[] = {
192   { P2P_MINOR_RESERVED, "Reserved" },
193   { P2P_MINOR_DISCONNECT_DUE_TO_CROSS_CONNECTION,
194     "Disconnected because Cross Connection capability is not allow" },
195   { P2P_MINOR_DISCONNECT_DUE_TO_NOT_P2P_MANAGED,
196     "Disconnected because P2P Infrastructure Managed not supported" },
197   { P2P_MINOR_DISCONNECT_DUE_TO_NO_COEXISTENCE,
198     "Disconnected because concurrent device is not setting coexistence "
199     "parameters" },
200   { P2P_MINOR_DISCONNECT_DUE_TO_OUTSIDE_POLICY,
201     "Disconnected because P2P operation is outside the IT defined policy" },
202   { 0, NULL }
203 };
204
205 static const value_string invitation_types[] = {
206   { 0, "Join active P2P Group" },
207   { 1, "Reinvoke Persistent Group" },
208   { 0, NULL }
209 };
210
211 static const value_string p2p_service_protocol_types[] = {
212   { 0, "All Service Protocol Types" },
213   { 1, "Bonjour" },
214   { 2, "UPnP" },
215   { 3, "WS-Discovery" },
216   { 4, "Wi-Fi Display" },
217   { 0, NULL }
218 };
219
220 static const value_string p2p_sd_status_codes[] = {
221   { 0, "Success" },
222   { 1, "Service Protocol Type not available" },
223   { 2, "Requested information not available" },
224   { 3, "Bad Request" },
225   { 0, NULL }
226 };
227
228 static int proto_p2p = -1;
229
230 static gint ett_p2p_tlv = -1;
231 static gint ett_p2p_service_tlv = -1;
232 static gint ett_p2p_client_descr = -1;
233
234 static int hf_p2p_attr_type = -1;
235 static int hf_p2p_attr_len = -1;
236
237 /* static int hf_p2p_attr_capab = -1; */
238 static int hf_p2p_attr_capab_device = -1;
239 static int hf_p2p_attr_capab_device_service_discovery = -1;
240 static int hf_p2p_attr_capab_device_client_discoverability = -1;
241 static int hf_p2p_attr_capab_device_concurrent_operation = -1;
242 static int hf_p2p_attr_capab_device_infrastructure_managed = -1;
243 static int hf_p2p_attr_capab_device_limit = -1;
244 static int hf_p2p_attr_capab_invitation_procedure = -1;
245 static int hf_p2p_attr_capab_group = -1;
246 static int hf_p2p_attr_capab_group_owner = -1;
247 static int hf_p2p_attr_capab_group_persistent = -1;
248 static int hf_p2p_attr_capab_group_limit = -1;
249 static int hf_p2p_attr_capab_group_intra_bss_distribution = -1;
250 static int hf_p2p_attr_capab_group_cross_connection = -1;
251 static int hf_p2p_attr_capab_group_persistent_reconnect = -1;
252 static int hf_p2p_attr_capab_group_group_formation = -1;
253
254 static int hf_p2p_attr_device_id = -1;
255
256 static int hf_p2p_attr_status = -1;
257
258 static int hf_p2p_attr_go_intent = -1;
259 static int hf_p2p_attr_go_intent_tie_breaker = -1;
260
261 /* static int hf_p2p_attr_listen_channel = -1; */
262 static int hf_p2p_attr_listen_channel_country = -1;
263 static int hf_p2p_attr_listen_channel_oper_class = -1;
264 static int hf_p2p_attr_listen_channel_number = -1;
265
266 /* static int hf_p2p_attr_operating_channel = -1; */
267 static int hf_p2p_attr_operating_channel_country = -1;
268 static int hf_p2p_attr_operating_channel_oper_class = -1;
269 static int hf_p2p_attr_operating_channel_number = -1;
270
271 /* static int hf_p2p_attr_channel_list = -1; */
272 static int hf_p2p_attr_channel_list_country = -1;
273 static int hf_p2p_attr_channel_list_oper_class = -1;
274 static int hf_p2p_attr_channel_list_num_chan = -1;
275 static int hf_p2p_attr_channel_list_chan = -1;
276
277 /* static int hf_p2p_attr_dev_info = -1; */
278 static int hf_p2p_attr_dev_info_p2p_dev_addr = -1;
279 static int hf_p2p_attr_dev_info_pri_dev_type = -1;
280 static int hf_p2p_attr_dev_info_pri_dev_type_category = -1;
281 static int hf_p2p_attr_dev_info_pri_dev_type_oui = -1;
282 static int hf_p2p_attr_dev_info_pri_dev_type_subcategory = -1;
283 static int hf_p2p_attr_dev_info_num_sec = -1;
284 static int hf_p2p_attr_dev_info_sec_dev_type = -1;
285 static int hf_p2p_attr_dev_info_dev_name_type = -1;
286 static int hf_p2p_attr_dev_info_dev_name_len = -1;
287 static int hf_p2p_attr_dev_info_dev_name = -1;
288 static int hf_p2p_attr_dev_info_config_methods = -1;
289 static int hf_p2p_attr_dev_info_config_methods_usba = -1;
290 static int hf_p2p_attr_dev_info_config_methods_ethernet = -1;
291 static int hf_p2p_attr_dev_info_config_methods_label = -1;
292 static int hf_p2p_attr_dev_info_config_methods_display = -1;
293 static int hf_p2p_attr_dev_info_config_methods_ext_nfc_token = -1;
294 static int hf_p2p_attr_dev_info_config_methods_int_nfc_token = -1;
295 static int hf_p2p_attr_dev_info_config_methods_nfc_interface = -1;
296 static int hf_p2p_attr_dev_info_config_methods_pushbutton = -1;
297 static int hf_p2p_attr_dev_info_config_methods_keypad = -1;
298 static int hf_p2p_attr_config_timeout_go = -1;
299 static int hf_p2p_attr_config_timeout_client = -1;
300 static int hf_p2p_attr_intended_interface_addr = -1;
301 static int hf_p2p_attr_extended_listen_timing_period = -1;
302 static int hf_p2p_attr_extended_listen_timing_interval = -1;
303 static int hf_p2p_attr_p2p_group_id_dev_addr = -1;
304 static int hf_p2p_attr_p2p_group_id_ssid = -1;
305 static int hf_p2p_attr_p2p_group_bssid = -1;
306
307 static int hf_p2p_attr_noa_index = -1;
308 static int hf_p2p_attr_noa_params = -1;
309 static int hf_p2p_attr_noa_params_opp_ps = -1;
310 static int hf_p2p_attr_noa_params_ctwindow = -1;
311 static int hf_p2p_attr_noa_count_type = -1;
312 static int hf_p2p_attr_noa_duration = -1;
313 static int hf_p2p_attr_noa_interval = -1;
314 static int hf_p2p_attr_noa_start_time = -1;
315
316 /* static int hf_p2p_attr_gi = -1; */
317 static int hf_p2p_attr_gi_length = -1;
318 static int hf_p2p_attr_gi_p2p_dev_addr = -1;
319 static int hf_p2p_attr_gi_p2p_iface_addr = -1;
320 static int hf_p2p_attr_gi_dev_capab = -1;
321 static int hf_p2p_attr_gi_dev_capab_service_discovery = -1;
322 static int hf_p2p_attr_gi_dev_capab_client_discoverability = -1;
323 static int hf_p2p_attr_gi_dev_capab_concurrent_operation = -1;
324 static int hf_p2p_attr_gi_dev_capab_infrastructure_managed = -1;
325 static int hf_p2p_attr_gi_dev_capab_limit = -1;
326 /* static int hf_p2p_attr_gi_dev_capab_invitation_procedure = -1; */
327 static int hf_p2p_attr_gi_config_methods = -1;
328 /* static int hf_p2p_attr_gi_config_methods_usba = -1; */
329 /* static int hf_p2p_attr_gi_config_methods_ethernet = -1; */
330 /* static int hf_p2p_attr_gi_config_methods_label = -1; */
331 /* static int hf_p2p_attr_gi_config_methods_display = -1; */
332 /* static int hf_p2p_attr_gi_config_methods_ext_nfc_token = -1; */
333 /* static int hf_p2p_attr_gi_config_methods_int_nfc_token = -1; */
334 /* static int hf_p2p_attr_gi_config_methods_nfc_interface = -1; */
335 /* static int hf_p2p_attr_gi_config_methods_pushbutton = -1; */
336 /* static int hf_p2p_attr_gi_config_methods_keypad = -1; */
337 static int hf_p2p_attr_gi_pri_dev_type = -1;
338 static int hf_p2p_attr_gi_pri_dev_type_category = -1;
339 static int hf_p2p_attr_gi_pri_dev_type_oui = -1;
340 static int hf_p2p_attr_gi_pri_dev_type_subcategory = -1;
341 static int hf_p2p_attr_gi_num_sec_dev_types = -1;
342 static int hf_p2p_attr_gi_sec_dev_type = -1;
343 static int hf_p2p_attr_gi_dev_name_type = -1;
344 static int hf_p2p_attr_gi_dev_name_len = -1;
345 static int hf_p2p_attr_gi_dev_name = -1;
346
347 static int hf_p2p_attr_invitation_flags = -1;
348 static int hf_p2p_attr_invitation_flags_type = -1;
349
350 static int hf_p2p_attr_manageability_bitmap = -1;
351 static int hf_p2p_attr_manageability_bitmap_mgmt = -1;
352 static int hf_p2p_attr_manageability_bitmap_cross_connect = -1;
353 static int hf_p2p_attr_manageability_bitmap_coex_opt = -1;
354
355 static int hf_p2p_attr_minor_reason_code = -1;
356
357 static int hf_p2p_anqp_service_update_indicator = -1;
358 static int hf_p2p_anqp_length = -1;
359 static int hf_p2p_anqp_service_protocol_type = -1;
360 static int hf_p2p_anqp_service_transaction_id = -1;
361 static int hf_p2p_anqp_query_data = -1;
362 static int hf_p2p_anqp_status_code = -1;
363 static int hf_p2p_anqp_response_data = -1;
364
365 static int hf_p2p_action_subtype = -1;
366 static int hf_p2p_action_dialog_token = -1;
367 static int hf_p2p_public_action_subtype = -1;
368 static int hf_p2p_public_action_dialog_token = -1;
369
370 static expert_field ei_wifi_p2p_attr_dev_info_dev_name_type = EI_INIT;
371 static expert_field ei_wifi_p2p_attr_len = EI_INIT;
372 static expert_field ei_wifi_p2p_anqp_length = EI_INIT;
373 static expert_field ei_wifi_p2p_anqp_unexpected_padding = EI_INIT;
374
375 static void dissect_wifi_p2p_capability(proto_item *tlv_root,
376                                         proto_item *tlv_item,
377                                         tvbuff_t *tvb, int offset)
378 {
379   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device, tvb,
380                       offset + 3, 1, ENC_BIG_ENDIAN);
381   proto_tree_add_item(tlv_root,
382                       hf_p2p_attr_capab_device_service_discovery, tvb,
383                       offset + 3, 1, ENC_BIG_ENDIAN);
384   proto_tree_add_item(tlv_root,
385                       hf_p2p_attr_capab_device_client_discoverability,
386                       tvb, offset + 3, 1, ENC_BIG_ENDIAN);
387   proto_tree_add_item(tlv_root,
388                       hf_p2p_attr_capab_device_concurrent_operation,
389                       tvb, offset + 3, 1, ENC_BIG_ENDIAN);
390   proto_tree_add_item(tlv_root,
391                       hf_p2p_attr_capab_device_infrastructure_managed,
392                       tvb, offset + 3, 1, ENC_BIG_ENDIAN);
393   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_device_limit, tvb,
394                       offset + 3, 1, ENC_BIG_ENDIAN);
395   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_invitation_procedure, tvb,
396                       offset + 3, 1, ENC_BIG_ENDIAN);
397
398   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group,
399                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
400   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_owner,
401                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
402   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_persistent,
403                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
404   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_limit,
405                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
406   proto_tree_add_item(tlv_root,
407                       hf_p2p_attr_capab_group_intra_bss_distribution,
408                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
409   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_cross_connection,
410                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
411   proto_tree_add_item(tlv_root,
412                       hf_p2p_attr_capab_group_persistent_reconnect,
413                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
414   proto_tree_add_item(tlv_root, hf_p2p_attr_capab_group_group_formation,
415                       tvb, offset + 4, 1, ENC_BIG_ENDIAN);
416
417   proto_item_append_text(tlv_item, ": Device 0x%x  Group 0x%x",
418                          tvb_get_guint8(tvb, offset + 3),
419                          tvb_get_guint8(tvb, offset + 4));
420 }
421
422 static void dissect_device_id(proto_item *tlv_root, proto_item *tlv_item,
423                               tvbuff_t *tvb, int offset)
424 {
425   guint8 addr[6];
426   proto_tree_add_item(tlv_root, hf_p2p_attr_device_id, tvb,
427                       offset + 3, 6, ENC_NA);
428   tvb_memcpy(tvb, addr, offset + 3, 6);
429   proto_item_append_text(tlv_item, ": %s", ether_to_str(addr));
430 }
431
432 static void dissect_group_owner_intent(proto_item *tlv_root,
433                                        proto_item *tlv_item,
434                                        tvbuff_t *tvb, int offset)
435 {
436   proto_tree_add_item(tlv_root, hf_p2p_attr_go_intent, tvb,
437                       offset + 3, 1, ENC_BIG_ENDIAN);
438   proto_tree_add_item(tlv_root, hf_p2p_attr_go_intent_tie_breaker, tvb,
439                       offset + 3, 1, ENC_BIG_ENDIAN);
440   proto_item_append_text(tlv_item, ": Intent %u  Tie breaker %u",
441                          tvb_get_guint8(tvb, offset + 3) >> 1,
442                          tvb_get_guint8(tvb, offset + 3) & 0x01);
443 }
444
445 static void dissect_status(proto_item *tlv_root, proto_item *tlv_item,
446                            tvbuff_t *tvb, int offset)
447 {
448   proto_tree_add_item(tlv_root, hf_p2p_attr_status, tvb,
449                       offset + 3, 1, ENC_BIG_ENDIAN);
450   proto_item_append_text(tlv_item, ": %u (%s)",
451                          tvb_get_guint8(tvb, offset + 3),
452                          val_to_str(tvb_get_guint8(tvb, offset + 3),
453                                     p2p_status_codes,
454                                     "Unknown Status Code (%u)"));
455 }
456
457 static void dissect_listen_channel(proto_item *tlv_root, proto_item *tlv_item,
458                                    tvbuff_t *tvb, int offset)
459 {
460   proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_country, tvb,
461                       offset + 3, 3, ENC_ASCII|ENC_NA);
462   proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_oper_class, tvb,
463                       offset + 6, 1, ENC_BIG_ENDIAN);
464   proto_tree_add_item(tlv_root, hf_p2p_attr_listen_channel_number, tvb,
465                       offset + 7, 1, ENC_BIG_ENDIAN);
466   proto_item_append_text(tlv_item, ": Operating Class %u  "
467                          "Channel Number %u",
468                          tvb_get_guint8(tvb, offset + 6),
469                          tvb_get_guint8(tvb, offset + 7));
470 }
471
472 static void dissect_operating_channel(proto_item *tlv_root,
473                                       proto_item *tlv_item,
474                                       tvbuff_t *tvb, int offset)
475 {
476   proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_country, tvb,
477                       offset + 3, 3, ENC_ASCII|ENC_NA);
478   proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_oper_class, tvb,
479                       offset + 6, 1, ENC_BIG_ENDIAN);
480   proto_tree_add_item(tlv_root, hf_p2p_attr_operating_channel_number, tvb,
481                       offset + 7, 1, ENC_BIG_ENDIAN);
482   proto_item_append_text(tlv_item, ": Operating Class %u  "
483                          "Channel Number %u",
484                          tvb_get_guint8(tvb, offset + 6),
485                          tvb_get_guint8(tvb, offset + 7));
486 }
487
488 static void dissect_channel_list(proto_item *tlv_root, tvbuff_t *tvb,
489                                  int offset, guint16 slen)
490 {
491   int s_offset = offset + 3;
492   guint8 num_chan;
493
494   proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_country, tvb,
495                       s_offset, 3, ENC_ASCII|ENC_NA);
496   s_offset += 3;
497
498   while (offset + 3 + slen > s_offset) {
499     proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_oper_class, tvb,
500                         s_offset, 1, ENC_BIG_ENDIAN);
501     s_offset++;
502
503     proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_num_chan, tvb,
504                         s_offset, 1, ENC_BIG_ENDIAN);
505     num_chan = tvb_get_guint8(tvb, s_offset);
506     s_offset++;
507
508     proto_tree_add_item(tlv_root, hf_p2p_attr_channel_list_chan, tvb,
509                         s_offset, num_chan, ENC_NA);
510     s_offset += num_chan;
511   }
512 }
513
514 static void dissect_wifi_p2p_device_info(packet_info *pinfo,
515                                          proto_item *tlv_root, tvbuff_t *tvb,
516                                          int offset, guint16 slen)
517 {
518   int s_offset, nlen;
519   guint8 num_sec;
520   guint16 attr_type, attr_len;
521   proto_item *item;
522
523   s_offset = offset + 3;
524
525   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_p2p_dev_addr, tvb,
526                       s_offset, 6, ENC_NA);
527   s_offset += 6;
528
529   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_config_methods,
530                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
531   proto_tree_add_item(tlv_root,
532                       hf_p2p_attr_dev_info_config_methods_usba,
533                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
534   proto_tree_add_item(tlv_root,
535                       hf_p2p_attr_dev_info_config_methods_ethernet,
536                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
537   proto_tree_add_item(tlv_root,
538                       hf_p2p_attr_dev_info_config_methods_label,
539                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
540   proto_tree_add_item(tlv_root,
541                       hf_p2p_attr_dev_info_config_methods_display,
542                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
543   proto_tree_add_item(tlv_root,
544                       hf_p2p_attr_dev_info_config_methods_ext_nfc_token,
545                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
546   proto_tree_add_item(tlv_root,
547                       hf_p2p_attr_dev_info_config_methods_int_nfc_token,
548                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
549   proto_tree_add_item(tlv_root,
550                       hf_p2p_attr_dev_info_config_methods_nfc_interface,
551                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
552   proto_tree_add_item(tlv_root,
553                       hf_p2p_attr_dev_info_config_methods_pushbutton,
554                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
555   proto_tree_add_item(tlv_root,
556                       hf_p2p_attr_dev_info_config_methods_keypad,
557                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
558
559   s_offset += 2;
560
561   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type, tvb,
562                       s_offset, 8, ENC_NA);
563   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_category,
564                       tvb, s_offset, 2, ENC_BIG_ENDIAN);
565   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_oui,
566                       tvb, s_offset + 2, 4, ENC_NA);
567   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_pri_dev_type_subcategory,
568                       tvb, s_offset + 6, 2, ENC_BIG_ENDIAN);
569   s_offset += 8;
570
571   num_sec = tvb_get_guint8(tvb, s_offset);
572   proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_num_sec, tvb,
573                       s_offset, 1, ENC_BIG_ENDIAN);
574   s_offset++;
575
576   while (num_sec > 0) {
577     proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_sec_dev_type,
578                         tvb, s_offset, 8, ENC_NA);
579     s_offset += 8;
580     num_sec--;
581   }
582
583   item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name_type,
584                              tvb, s_offset, 2, ENC_BIG_ENDIAN);
585   attr_type = tvb_get_ntohs(tvb, s_offset);
586   if (attr_type != 0x1011) {
587     expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_dev_info_dev_name_type, "Incorrect Device Name attribute type");
588   }
589   s_offset += 2;
590   item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name_len,
591                              tvb, s_offset, 2, ENC_BIG_ENDIAN);
592   attr_len = tvb_get_ntohs(tvb, s_offset);
593   s_offset += 2;
594   if (attr_len > offset + 3 + slen - s_offset) {
595     expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute length");
596     return;
597   }
598   nlen = offset + 3 + slen - s_offset;
599   if (nlen > 0)
600     item = proto_tree_add_item(tlv_root, hf_p2p_attr_dev_info_dev_name,
601                                tvb, s_offset,
602                                nlen > attr_len ? attr_len : nlen,
603                                ENC_ASCII|ENC_NA);
604   if (nlen != attr_len) {
605     expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute");
606   }
607 }
608
609 static void dissect_configuration_timeout(proto_item *tlv_root,
610                                           proto_item *tlv_item,
611                                           tvbuff_t *tvb, int offset)
612 {
613   proto_tree_add_item(tlv_root, hf_p2p_attr_config_timeout_go, tvb,
614                       offset + 3, 1, ENC_BIG_ENDIAN);
615   proto_tree_add_item(tlv_root, hf_p2p_attr_config_timeout_client, tvb,
616                       offset + 4, 1, ENC_BIG_ENDIAN);
617   proto_item_append_text(tlv_item, ": GO %u msec, client %u msec",
618                          tvb_get_guint8(tvb, offset + 3) * 10,
619                          tvb_get_guint8(tvb, offset + 4) * 10);
620 }
621
622 static void dissect_intended_interface_addr(proto_item *tlv_root,
623                                             proto_item *tlv_item,
624                                             tvbuff_t *tvb, int offset)
625 {
626   guint8 addr[6];
627   proto_tree_add_item(tlv_root, hf_p2p_attr_intended_interface_addr, tvb,
628                       offset + 3, 6, ENC_NA);
629   tvb_memcpy(tvb, addr, offset + 3, 6);
630   proto_item_append_text(tlv_item, ": %s", ether_to_str(addr));
631 }
632
633 static void dissect_extended_listen_timing(proto_item *tlv_root,
634                                            proto_item *tlv_item,
635                                            tvbuff_t *tvb, int offset)
636 {
637   guint16 period, interval;
638   period = tvb_get_letohs(tvb, offset + 3);
639   interval = tvb_get_letohs(tvb, offset + 5);
640   proto_tree_add_uint(tlv_root, hf_p2p_attr_extended_listen_timing_period, tvb,
641                       offset + 3, 2, period);
642   proto_tree_add_uint(tlv_root, hf_p2p_attr_extended_listen_timing_interval,
643                       tvb, offset + 5, 2, interval);
644   proto_item_append_text(tlv_item, ": Availability Period %u msec, "
645                          "Availability Interval %u msec", period, interval);
646 }
647
648 static void dissect_wifi_p2p_group_id(proto_item *tlv_root,
649                                       proto_item *tlv_item, tvbuff_t *tvb,
650                                       int offset, guint16 slen)
651 {
652   int s_offset;
653   guint8 addr[6];
654
655   s_offset = offset + 3;
656   proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_dev_addr, tvb,
657                       s_offset, 6, ENC_NA);
658   tvb_memcpy(tvb, addr, offset + 3, 6);
659   proto_item_append_text(tlv_item, ": %s", ether_to_str(addr));
660   s_offset += 6;
661   proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_id_ssid, tvb,
662                       s_offset, offset + 3 + slen - s_offset, ENC_ASCII|ENC_NA);
663 }
664
665 static void dissect_wifi_p2p_group_bssid(packet_info *pinfo,
666                                          proto_item *tlv_root,
667                                          proto_item *tlv_item, tvbuff_t *tvb,
668                                          int offset, guint16 slen)
669 {
670   int s_offset;
671   guint8 addr[6];
672
673   if (slen != 6) {
674     expert_add_info_format(pinfo, tlv_item, &ei_wifi_p2p_attr_len, "Invalid ethernet address");
675     return;
676   }
677
678   s_offset = offset + 3;
679   proto_tree_add_item(tlv_root, hf_p2p_attr_p2p_group_bssid, tvb,
680                       s_offset, 6, ENC_NA);
681   tvb_memcpy(tvb, addr, offset + 3, 6);
682   proto_item_append_text(tlv_item, ": %s", ether_to_str(addr));
683 }
684
685 static void dissect_notice_of_absence(packet_info *pinfo, proto_item *tlv_root,
686                                       proto_item *tlv_item,
687                                       tvbuff_t *tvb, int offset, guint16 slen)
688 {
689   int s_offset = offset + 3;
690
691   if (slen < 2) {
692     expert_add_info_format(pinfo, tlv_item, &ei_wifi_p2p_attr_len, "Too short NoA");
693     return;
694   }
695
696   proto_tree_add_item(tlv_root, hf_p2p_attr_noa_index, tvb, s_offset, 1,
697                       ENC_BIG_ENDIAN);
698   proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params, tvb, s_offset + 1, 1,
699                       ENC_BIG_ENDIAN);
700   proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params_opp_ps, tvb,
701                       s_offset + 1, 1, ENC_BIG_ENDIAN);
702   proto_tree_add_item(tlv_root, hf_p2p_attr_noa_params_ctwindow, tvb,
703                       s_offset + 1, 1, ENC_BIG_ENDIAN);
704
705   s_offset += 2;
706   while (offset + 3 + slen >= s_offset + 13) {
707     proto_tree_add_item(tlv_root, hf_p2p_attr_noa_count_type, tvb, s_offset, 1,
708                         ENC_BIG_ENDIAN);
709     s_offset++;
710     proto_tree_add_item(tlv_root, hf_p2p_attr_noa_duration, tvb, s_offset, 4,
711                         ENC_LITTLE_ENDIAN);
712     s_offset += 4;
713     proto_tree_add_item(tlv_root, hf_p2p_attr_noa_interval, tvb, s_offset, 4,
714                         ENC_LITTLE_ENDIAN);
715     s_offset += 4;
716     proto_tree_add_item(tlv_root, hf_p2p_attr_noa_start_time, tvb, s_offset, 4,
717                         ENC_LITTLE_ENDIAN);
718     s_offset += 4;
719   }
720 }
721
722 static void dissect_wifi_p2p_group_info(packet_info *pinfo,
723                                         proto_item *tlv_root,
724                                         proto_item *tlv_item,
725                                         tvbuff_t *tvb, int offset,
726                                         guint16 slen)
727 {
728   int s_offset = offset + 3;
729   int next_offset, ci_len, num_sec, left, nlen;
730   guint16 attr_type, attr_len;
731   proto_item *item;
732   proto_tree *tree;
733
734   while (offset + 3 + slen > s_offset) {
735     if (offset + 3 + slen - s_offset < 25) {
736       expert_add_info_format(pinfo, tlv_item, &ei_wifi_p2p_attr_len, "Too short P2P Client Info Descriptor");
737       break;
738     }
739
740     ci_len = tvb_get_guint8(tvb, s_offset);
741     item = proto_tree_add_text(tlv_root, tvb, s_offset, 1 + ci_len,
742                                "P2P Client Info Descriptor");
743     tree = proto_item_add_subtree(item, ett_p2p_client_descr);
744
745     item = proto_tree_add_item(tree, hf_p2p_attr_gi_length, tvb, s_offset,
746                                1, ENC_BIG_ENDIAN);
747     if (ci_len < 24 || s_offset + ci_len > offset + 3 + slen) {
748       expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid P2P Client Info Descriptor Length");
749       break;
750     }
751     s_offset++;
752     next_offset = s_offset + ci_len;
753
754     proto_tree_add_item(tree, hf_p2p_attr_gi_p2p_dev_addr, tvb, s_offset,
755                         6, ENC_NA);
756     proto_item_append_text(tree, ": %s", tvb_ether_to_str(tvb, s_offset));
757     s_offset += 6;
758
759     proto_tree_add_item(tree, hf_p2p_attr_gi_p2p_iface_addr, tvb, s_offset,
760                         6, ENC_NA);
761     s_offset += 6;
762
763     proto_tree_add_item(tree, hf_p2p_attr_gi_dev_capab, tvb, s_offset, 1,
764                         ENC_BIG_ENDIAN);
765     proto_tree_add_item(tree,
766                         hf_p2p_attr_gi_dev_capab_service_discovery, tvb,
767                         s_offset, 1, ENC_BIG_ENDIAN);
768     proto_tree_add_item(tree,
769                         hf_p2p_attr_gi_dev_capab_client_discoverability,
770                         tvb, s_offset, 1, ENC_BIG_ENDIAN);
771     proto_tree_add_item(tree,
772                         hf_p2p_attr_gi_dev_capab_concurrent_operation,
773                         tvb, s_offset, 1, ENC_BIG_ENDIAN);
774     proto_tree_add_item(tree,
775                         hf_p2p_attr_gi_dev_capab_infrastructure_managed,
776                         tvb, s_offset, 1, ENC_BIG_ENDIAN);
777     proto_tree_add_item(tree, hf_p2p_attr_gi_dev_capab_limit, tvb,
778                         s_offset, 1, ENC_BIG_ENDIAN);
779     proto_tree_add_item(tree, hf_p2p_attr_capab_invitation_procedure, tvb,
780                         s_offset, 1, ENC_BIG_ENDIAN);
781     s_offset++;
782
783     proto_tree_add_item(tree, hf_p2p_attr_gi_config_methods, tvb, s_offset,
784                         2, ENC_BIG_ENDIAN);
785     s_offset += 2;
786
787     proto_tree_add_item(tree, hf_p2p_attr_gi_pri_dev_type, tvb,
788                         s_offset, 8, ENC_NA);
789     proto_tree_add_item(tree, hf_p2p_attr_gi_pri_dev_type_category,
790                         tvb, s_offset, 2, ENC_BIG_ENDIAN);
791     proto_tree_add_item(tree, hf_p2p_attr_gi_pri_dev_type_oui,
792                         tvb, s_offset + 2, 4, ENC_NA);
793     proto_tree_add_item(tree, hf_p2p_attr_gi_pri_dev_type_subcategory,
794                         tvb, s_offset + 6, 2, ENC_BIG_ENDIAN);
795     s_offset += 8;
796
797     item = proto_tree_add_item(tree, hf_p2p_attr_gi_num_sec_dev_types, tvb,
798                                s_offset, 1, ENC_BIG_ENDIAN);
799     num_sec = tvb_get_guint8(tvb, s_offset);
800     s_offset++;
801     left = offset + 3 + slen - s_offset;
802     if (left < 8 * num_sec) {
803       expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Secondary Device Type List");
804       break;
805     }
806     while (num_sec > 0) {
807       proto_tree_add_item(tree, hf_p2p_attr_gi_sec_dev_type,
808                           tvb, s_offset, 8, ENC_NA);
809       s_offset += 8;
810       num_sec--;
811     }
812
813     item = proto_tree_add_item(tree, hf_p2p_attr_gi_dev_name_type,
814                                tvb, s_offset, 2, ENC_BIG_ENDIAN);
815     attr_type = tvb_get_ntohs(tvb, s_offset);
816     if (attr_type != 0x1011) {
817       expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_dev_info_dev_name_type, "Incorrect Device Name attribute type");
818     }
819     s_offset += 2;
820     item = proto_tree_add_item(tree, hf_p2p_attr_gi_dev_name_len,
821                                tvb, s_offset, 2, ENC_BIG_ENDIAN);
822     attr_len = tvb_get_ntohs(tvb, s_offset);
823     s_offset += 2;
824     if (attr_len > offset + 3 + slen - s_offset) {
825       expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute length");
826       break;
827     }
828     nlen = next_offset - s_offset;
829     if (nlen > 0)
830       item = proto_tree_add_item(tree, hf_p2p_attr_gi_dev_name,
831                                  tvb, s_offset,
832                                  nlen > attr_len ? attr_len : nlen,
833                                  ENC_ASCII|ENC_NA);
834     if (nlen != attr_len) {
835       expert_add_info_format(pinfo, item, &ei_wifi_p2p_attr_len, "Invalid Device Name attribute");
836     }
837
838     s_offset = next_offset;
839   }
840 }
841
842 static void dissect_invitation_flags(proto_item *tlv_root,
843                                      proto_item *tlv_item,
844                                      tvbuff_t *tvb, int offset)
845 {
846   proto_tree_add_item(tlv_root, hf_p2p_attr_invitation_flags, tvb,
847                       offset + 3, 1, ENC_BIG_ENDIAN);
848   proto_tree_add_item(tlv_root, hf_p2p_attr_invitation_flags_type, tvb,
849                       offset + 3, 1, ENC_BIG_ENDIAN);
850   proto_item_append_text(tlv_item, ": Invitation Flags 0x%x",
851                          tvb_get_guint8(tvb, offset + 3));
852 }
853
854 static void dissect_manageability(proto_item *tlv_root,
855                                   proto_item *tlv_item,
856                                   tvbuff_t *tvb, int offset)
857 {
858   proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap, tvb,
859                       offset + 3, 1, ENC_BIG_ENDIAN);
860   proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_mgmt, tvb,
861                       offset + 3, 1, ENC_BIG_ENDIAN);
862   proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_cross_connect,
863                       tvb, offset + 3, 1, ENC_BIG_ENDIAN);
864   proto_tree_add_item(tlv_root, hf_p2p_attr_manageability_bitmap_coex_opt, tvb,
865                       offset + 3, 1, ENC_BIG_ENDIAN);
866   proto_item_append_text(tlv_item, ": Bitmap field 0x%x",
867                          tvb_get_guint8(tvb, offset + 3));
868 }
869
870 static void dissect_minor_reason_code(proto_item *tlv_root,
871                                       proto_item *tlv_item,
872                                       tvbuff_t *tvb, int offset)
873 {
874   proto_tree_add_item(tlv_root, hf_p2p_attr_minor_reason_code, tvb,
875                       offset + 3, 1, ENC_BIG_ENDIAN);
876   proto_item_append_text(tlv_item, ": %u (%s)",
877                          tvb_get_guint8(tvb, offset + 3),
878                          val_to_str(tvb_get_guint8(tvb, offset + 3),
879                                     p2p_minor_reason_codes,
880                                     "Unknown Minor Reason Code (%u)"));
881 }
882
883 void dissect_wifi_p2p_ie(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
884                          int offset, gint size)
885 {
886   guint16 slen = 0;
887   guint8 stype = 0;
888   proto_item *tlv_root, *tlv_item;
889
890   while (size > 0) {
891     if (size < 3) {
892       expert_add_info_format(pinfo, NULL, &ei_wifi_p2p_attr_len, "Packet too short for P2P IE");
893       break;
894     }
895
896     stype = tvb_get_guint8(tvb, offset);
897     slen = tvb_get_letohs(tvb, offset + 1);
898
899     tlv_item = proto_tree_add_text(tree, tvb, offset, 3 + slen, "%s",
900                                    val_to_str(stype, p2p_attr_types,
901                                               "Unknown attribute type (%u)"));
902     tlv_root = proto_item_add_subtree(tlv_item, ett_p2p_tlv);
903
904     proto_tree_add_item(tlv_root, hf_p2p_attr_type, tvb, offset, 1, ENC_BIG_ENDIAN);
905     proto_tree_add_uint(tlv_root, hf_p2p_attr_len, tvb, offset + 1, 2,
906                         slen);
907
908     switch(stype) {
909     case P2P_ATTR_P2P_CAPABILITY:
910       dissect_wifi_p2p_capability(tlv_root, tlv_item, tvb, offset);
911       break;
912     case P2P_ATTR_P2P_DEVICE_ID:
913       dissect_device_id(tlv_root, tlv_item, tvb, offset);
914       break;
915     case P2P_ATTR_GROUP_OWNER_INTENT:
916       dissect_group_owner_intent(tlv_root, tlv_item, tvb, offset);
917       break;
918     case P2P_ATTR_STATUS:
919       dissect_status(tlv_root, tlv_item, tvb, offset);
920       break;
921     case P2P_ATTR_LISTEN_CHANNEL:
922       dissect_listen_channel(tlv_root, tlv_item, tvb, offset);
923       break;
924     case P2P_ATTR_OPERATING_CHANNEL:
925       dissect_operating_channel(tlv_root, tlv_item, tvb, offset);
926       break;
927     case P2P_ATTR_CHANNEL_LIST:
928       dissect_channel_list(tlv_root, tvb, offset, slen);
929       break;
930     case P2P_ATTR_P2P_DEVICE_INFO:
931       dissect_wifi_p2p_device_info(pinfo, tlv_root, tvb, offset, slen);
932       break;
933     case P2P_ATTR_CONFIGURATION_TIMEOUT:
934       dissect_configuration_timeout(tlv_root, tlv_item, tvb, offset);
935       break;
936     case P2P_ATTR_INTENDED_P2P_INTERFACE_ADDRESS:
937       dissect_intended_interface_addr(tlv_root, tlv_item, tvb, offset);
938       break;
939     case P2P_ATTR_EXTENDED_LISTEN_TIMING:
940       dissect_extended_listen_timing(tlv_root, tlv_item, tvb, offset);
941       break;
942     case P2P_ATTR_P2P_GROUP_ID:
943       dissect_wifi_p2p_group_id(tlv_root, tlv_item, tvb, offset, slen);
944       break;
945     case P2P_ATTR_P2P_GROUP_BSSID:
946       dissect_wifi_p2p_group_bssid(pinfo, tlv_root, tlv_item, tvb, offset, slen);
947       break;
948     case P2P_ATTR_NOTICE_OF_ABSENCE:
949       dissect_notice_of_absence(pinfo, tlv_root, tlv_item, tvb, offset, slen);
950       break;
951     case P2P_ATTR_P2P_GROUP_INFO:
952       dissect_wifi_p2p_group_info(pinfo, tlv_root, tlv_item, tvb, offset,
953                                   slen);
954       break;
955     case P2P_ATTR_INVITATION_FLAGS:
956       dissect_invitation_flags(tlv_root, tlv_item, tvb, offset);
957       break;
958     case P2P_ATTR_P2P_MANAGEABILITY:
959       dissect_manageability(tlv_root, tlv_item, tvb, offset);
960       break;
961     case P2P_ATTR_MINOR_REASON_CODE:
962       dissect_minor_reason_code(tlv_root, tlv_item, tvb, offset);
963       break;
964     }
965
966     offset += 3 + slen;
967     size -= 3 + slen;
968   }
969 }
970
971 int dissect_wifi_p2p_public_action(packet_info *pinfo, proto_tree *tree,
972                                    tvbuff_t *tvb, int offset)
973 {
974   guint8 subtype;
975   proto_tree_add_item(tree, hf_p2p_public_action_subtype, tvb, offset, 1,
976                       ENC_BIG_ENDIAN);
977   subtype = tvb_get_guint8(tvb, offset);
978   col_append_fstr(pinfo->cinfo, COL_INFO, ", P2P - %s",
979                   val_to_str(subtype, p2p_public_action_subtypes,
980                              "Unknown (%u)"));
981   offset++;
982   proto_tree_add_item(tree, hf_p2p_public_action_dialog_token, tvb, offset, 1,
983                       ENC_BIG_ENDIAN);
984   offset++;
985   /* Followed by variable length IEs dissected by packet-ieee80211.c */
986   return offset;
987 }
988
989 int dissect_wifi_p2p_action(proto_tree *tree, tvbuff_t *tvb, int offset)
990 {
991   proto_tree_add_item(tree, hf_p2p_action_subtype, tvb, offset, 1, ENC_BIG_ENDIAN);
992   offset++;
993   proto_tree_add_item(tree, hf_p2p_action_dialog_token, tvb, offset, 1, ENC_BIG_ENDIAN);
994   offset++;
995   /* Followed by variable length IEs dissected by packet-ieee80211.c */
996   return offset;
997 }
998
999 void dissect_wifi_p2p_anqp(packet_info *pinfo, proto_tree *tree, tvbuff_t *tvb,
1000                            int offset, gboolean request)
1001 {
1002   proto_item *item;
1003
1004   item = proto_tree_add_item(tree, hf_p2p_anqp_service_update_indicator, tvb,
1005                              offset, 2, ENC_LITTLE_ENDIAN);
1006   offset += 2;
1007
1008   while (tvb_length_remaining(tvb, offset) >= (request ? 4 : 5)) {
1009     guint16 len;
1010     proto_tree *tlv;
1011     guint8 type, id, sd_proto;
1012
1013     len = tvb_get_letohs(tvb, offset);
1014     if (len < 2) {
1015       expert_add_info_format(pinfo, item, &ei_wifi_p2p_anqp_length, "Too short Service TLV field");
1016       return;
1017     }
1018     if (len > tvb_length_remaining(tvb, offset + 2)) {
1019       expert_add_info_format(pinfo, item, &ei_wifi_p2p_anqp_length, "Too short frame for Service TLV field");
1020       return;
1021     }
1022
1023     type = tvb_get_guint8(tvb, offset + 2);
1024     id = tvb_get_guint8(tvb, offset + 3);
1025     item = proto_tree_add_text(tree, tvb, offset, 2 + len,
1026                                "Service TLV (Transaction ID: %u  Type: %s)",
1027                                id, val_to_str(type, p2p_service_protocol_types,
1028                                               "Unknown (%u)"));
1029     tlv = proto_item_add_subtree(item, ett_p2p_service_tlv);
1030
1031     proto_tree_add_item(tlv, hf_p2p_anqp_length, tvb, offset, 2, ENC_LITTLE_ENDIAN);
1032     offset += 2;
1033     sd_proto = tvb_get_guint8(tvb, offset);
1034     proto_tree_add_item(tlv, hf_p2p_anqp_service_protocol_type, tvb,
1035                         offset, 1, ENC_BIG_ENDIAN);
1036     proto_tree_add_item(tlv, hf_p2p_anqp_service_transaction_id, tvb,
1037                         offset + 1, 1, ENC_BIG_ENDIAN);
1038     if (request) {
1039       proto_tree_add_item(tlv, hf_p2p_anqp_query_data, tvb,
1040                           offset + 2, len - 2, ENC_NA);
1041     } else {
1042       proto_tree_add_item(tlv, hf_p2p_anqp_status_code, tvb,
1043                           offset + 2, 1, ENC_BIG_ENDIAN);
1044       proto_tree_add_item(tlv, hf_p2p_anqp_response_data, tvb,
1045                           offset + 3, len - 3, ENC_NA);
1046       if (sd_proto == 4)
1047         dissect_wifi_display_ie(pinfo, tlv, tvb, offset + 3, len - 3);
1048     }
1049     offset += len;
1050   }
1051
1052   if (tvb_length_remaining(tvb, offset) > 0) {
1053     expert_add_info(pinfo, item, &ei_wifi_p2p_anqp_unexpected_padding);
1054   }
1055 }
1056
1057 void
1058 proto_register_p2p(void)
1059 {
1060   static hf_register_info hf[] = {
1061     { &hf_p2p_attr_type,
1062       { "Attribute Type", "wifi_p2p.type",
1063         FT_UINT8, BASE_DEC, VALS(p2p_attr_types), 0x0, NULL, HFILL }},
1064     { &hf_p2p_attr_len,
1065       { "Attribute Length", "wifi_p2p.length",
1066         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1067
1068 #if 0
1069     { &hf_p2p_attr_capab,
1070       { "P2P Capability", "wifi_p2p.p2p_capability",
1071         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1072 #endif
1073     { &hf_p2p_attr_capab_device,
1074       { "Device Capability Bitmap",
1075         "wifi_p2p.p2p_capability.device_capability",
1076         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1077     { &hf_p2p_attr_capab_device_service_discovery,
1078       { "Service Discovery",
1079         "wifi_p2p.p2p_capability.device_capability.service_discovery",
1080         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_SERVICE_DISCOVERY, NULL, HFILL
1081       }},
1082     { &hf_p2p_attr_capab_device_client_discoverability,
1083       { "P2P Client Discoverability",
1084         "wifi_p2p.p2p_capability.device_capability.client_discoverability",
1085         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_CLIENT_DISCOVERABILITY,
1086         NULL, HFILL
1087       }},
1088     { &hf_p2p_attr_capab_device_concurrent_operation,
1089       { "Concurrent Operation",
1090         "wifi_p2p.p2p_capability.device_capability.concurrent_operation",
1091         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_CONCURRENT_OPERATION, NULL,
1092         HFILL
1093       }},
1094     { &hf_p2p_attr_capab_device_infrastructure_managed,
1095       { "P2P Infrastructure Managed",
1096         "wifi_p2p.p2p_capability.device_capability.infrastructure_managed",
1097         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_INFRASTRUCTURE_MANAGED,
1098         NULL, HFILL
1099       }},
1100     { &hf_p2p_attr_capab_device_limit,
1101       { "P2P Device Limit",
1102         "wifi_p2p.p2p_capability.device_capability.device_limit",
1103         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_DEVICE_LIMIT, NULL, HFILL
1104       }},
1105     { &hf_p2p_attr_capab_invitation_procedure,
1106       { "P2P Invitation Procedure",
1107         "wifi_p2p.p2p_capability.device_capability.invitation_procedure",
1108         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_INVITATION_PROCEDURE, NULL,
1109         HFILL
1110       }},
1111     { &hf_p2p_attr_capab_group,
1112       { "Group Capability Bitmap", "wifi_p2p.p2p_capability.group_capability",
1113         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1114     { &hf_p2p_attr_capab_group_owner,
1115       { "P2P Group Owner",
1116         "wifi_p2p.p2p_capability.group_capability.group_owner",
1117         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_P2P_GROUP_OWNER, NULL, HFILL
1118       }},
1119     { &hf_p2p_attr_capab_group_persistent,
1120       { "Persistent P2P Group",
1121         "wifi_p2p.p2p_capability.group_capability.persistent_group",
1122         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_PERSISTENT_P2P_GROUP, NULL,
1123         HFILL }},
1124     { &hf_p2p_attr_capab_group_limit,
1125       { "P2P Group Limit",
1126         "wifi_p2p.p2p_capability.group_capability.group_limit",
1127         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_P2P_GROUP_LIMIT, NULL, HFILL
1128       }},
1129     { &hf_p2p_attr_capab_group_intra_bss_distribution,
1130       { "Intra-BSS Distribution",
1131         "wifi_p2p.p2p_capability.group_capability.intra_bss_distribution",
1132         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_INTRA_BSS_DISTRIBUTION, NULL,
1133         HFILL }},
1134     { &hf_p2p_attr_capab_group_cross_connection,
1135       { "Cross Connection",
1136         "wifi_p2p.p2p_capability.group_capability.cross_connection",
1137         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_CROSS_CONNECTION, NULL, HFILL
1138       }},
1139     { &hf_p2p_attr_capab_group_persistent_reconnect,
1140       { "Persistent Reconnect",
1141         "wifi_p2p.p2p_capability.group_capability.persistent_reconnect",
1142         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_PERSISTENT_RECONNECT, NULL,
1143         HFILL }},
1144     { &hf_p2p_attr_capab_group_group_formation,
1145       { "Group Formation",
1146         "wifi_p2p.p2p_capability.group_capability.group_formation",
1147         FT_UINT8, BASE_HEX, NULL, P2P_GROUP_CAPAB_GROUP_FORMATION, NULL, HFILL
1148       }},
1149
1150     { &hf_p2p_attr_device_id,
1151       { "Device ID", "wifi_p2p.device_id",
1152         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1153
1154     { &hf_p2p_attr_status,
1155       { "Status Code", "wifi_p2p.status",
1156         FT_UINT8, BASE_DEC, VALS(p2p_status_codes), 0x0, NULL, HFILL }},
1157
1158     { &hf_p2p_attr_go_intent,
1159       { "Group Owner Intent", "wifi_p2p.go_intent",
1160         FT_UINT8, BASE_DEC, NULL, 0x1e, NULL, HFILL }},
1161     { &hf_p2p_attr_go_intent_tie_breaker,
1162       { "Group Owner Intent Tie Breaker", "wifi_p2p.go_intent_tie_breaker",
1163         FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL }},
1164
1165 #if 0
1166     { &hf_p2p_attr_listen_channel,
1167       { "Listen Channel", "wifi_p2p.listen_channel",
1168         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1169 #endif
1170     { &hf_p2p_attr_listen_channel_country,
1171       { "Country String", "wifi_p2p.listen_channel.country_string",
1172         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1173     { &hf_p2p_attr_listen_channel_oper_class,
1174       { "Operating Class", "wifi_p2p.listen_channel.operating_class",
1175         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1176     { &hf_p2p_attr_listen_channel_number,
1177       { "Channel Number", "wifi_p2p.listen_channel.channel_number",
1178         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1179
1180 #if 0
1181     { &hf_p2p_attr_operating_channel,
1182       { "Operating Channel", "wifi_p2p.operating_channel",
1183         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1184 #endif
1185     { &hf_p2p_attr_operating_channel_country,
1186       { "Country String", "wifi_p2p.operating_channel.country_string",
1187         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1188     { &hf_p2p_attr_operating_channel_oper_class,
1189       { "Operating Class", "wifi_p2p.channel.operating_class",
1190         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1191     { &hf_p2p_attr_operating_channel_number,
1192       { "Channel Number", "wifi_p2p.channel.channel_number",
1193         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1194
1195 #if 0
1196     { &hf_p2p_attr_channel_list,
1197       { "Channel List", "wifi_p2p.channel_list",
1198         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1199 #endif
1200     { &hf_p2p_attr_channel_list_country,
1201       { "Country String", "wifi_p2p.channel_list.country_string",
1202         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1203     { &hf_p2p_attr_channel_list_oper_class,
1204       { "Operating Class", "wifi_p2p.channel_list.operating_class",
1205         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1206     { &hf_p2p_attr_channel_list_num_chan,
1207       { "Number of Channels", "wifi_p2p.channel_list.num_chan",
1208         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1209     { &hf_p2p_attr_channel_list_chan,
1210       { "Channel List", "wifi_p2p.channel_list.channel_list",
1211         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1212 #if 0
1213     { &hf_p2p_attr_dev_info,
1214       { "Device Info", "wifi_p2p.dev_info",
1215         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1216 #endif
1217     { &hf_p2p_attr_dev_info_p2p_dev_addr,
1218       { "P2P Device address", "wifi_p2p.dev_info.p2p_dev_addr",
1219         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1220     { &hf_p2p_attr_dev_info_pri_dev_type,
1221       { "Primary Device Type", "wifi_p2p.dev_info.pri_dev_type",
1222         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1223     { &hf_p2p_attr_dev_info_pri_dev_type_category,
1224       { "Primary Device Type: Category",
1225         "wifi_p2p.dev_info.pri_dev_type.category",
1226         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1227     { &hf_p2p_attr_dev_info_pri_dev_type_oui,
1228       { "Primary Device Type: OUI", "wifi_p2p.dev_info.pri_dev_type.oui",
1229         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1230     { &hf_p2p_attr_dev_info_pri_dev_type_subcategory,
1231       { "Primary Device Type: Subcategory",
1232         "wifi_p2p.dev_info.pri_dev_type.subcategory",
1233         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1234     { &hf_p2p_attr_dev_info_num_sec,
1235       { "Number of Secondary Device Types", "wifi_p2p.dev_info.num_sec",
1236         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1237     { &hf_p2p_attr_dev_info_sec_dev_type,
1238       { "Secondary Device Type", "wifi_p2p.dev_info.sec_dev_type",
1239         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1240     { &hf_p2p_attr_dev_info_dev_name_type,
1241       { "Device Name attribute type", "wifi_p2p.dev_info.dev_name_type",
1242         FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1243     { &hf_p2p_attr_dev_info_dev_name_len,
1244       { "Device Name attribute length", "wifi_p2p.dev_info.dev_name",
1245         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1246     { &hf_p2p_attr_dev_info_dev_name,
1247       { "Device Name", "wifi_p2p.dev_info.dev_name",
1248         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1249     { &hf_p2p_attr_dev_info_config_methods,
1250       { "Config Methods", "wifi_p2p.dev_info.config_methods",
1251         FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
1252     { &hf_p2p_attr_dev_info_config_methods_usba,
1253       { "USBA (Flash Drive)", "wifi_p2p.dev_info.config_methods.usba",
1254         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_USBA, NULL, HFILL }},
1255     { &hf_p2p_attr_dev_info_config_methods_ethernet,
1256       { "Ethernet", "wifi_p2p.dev_info.config_methods.ethernet",
1257         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_ETHERNET, NULL, HFILL }},
1258     { &hf_p2p_attr_dev_info_config_methods_label,
1259       { "Label", "wifi_p2p.dev_info.config_methods.label",
1260         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_LABEL, NULL, HFILL }},
1261     { &hf_p2p_attr_dev_info_config_methods_display,
1262       { "Display", "wifi_p2p.dev_info.config_methods.display",
1263         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_DISPLAY, NULL, HFILL }},
1264     { &hf_p2p_attr_dev_info_config_methods_ext_nfc_token,
1265       { "External NFC Token", "wifi_p2p.dev_info.config_methods.ext_nfc_token",
1266         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_EXT_NFC_TOKEN, NULL, HFILL }},
1267     { &hf_p2p_attr_dev_info_config_methods_int_nfc_token,
1268       { "Integrated NFC Token",
1269         "wifi_p2p.dev_info.config_methods.int_nfc_token",
1270         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_INT_NFC_TOKEN, NULL, HFILL }},
1271     { &hf_p2p_attr_dev_info_config_methods_nfc_interface,
1272       { "NFC Interface", "wifi_p2p.dev_info.config_methods.nfc_interface",
1273         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_NFC_INTERFACE, NULL, HFILL }},
1274     { &hf_p2p_attr_dev_info_config_methods_pushbutton,
1275       { "PushButton", "wifi_p2p.dev_info.config_methods.pushbutton",
1276         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_PUSHBUTTON, NULL, HFILL }},
1277     { &hf_p2p_attr_dev_info_config_methods_keypad,
1278       { "Keypad", "wifi_p2p.dev_info.config_methods.keypad",
1279         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_KEYPAD, NULL, HFILL }},
1280     { &hf_p2p_attr_config_timeout_go,
1281       { "GO Configuration Timeout", "wifi_p2p.config_timeout.go",
1282         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1283     { &hf_p2p_attr_config_timeout_client,
1284       { "Client Configuration Timeout", "wifi_p2p.config_timeout.client",
1285         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1286     { &hf_p2p_attr_intended_interface_addr,
1287       { "P2P Interface Address", "wifi_p2p.intended_interface_addr",
1288         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1289     { &hf_p2p_attr_extended_listen_timing_period,
1290       { "Availability Period", "wifi_p2p.extended_listen_timing.period",
1291         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1292     { &hf_p2p_attr_extended_listen_timing_interval,
1293       { "Availability Interval", "wifi_p2p.extended_listen_timing.interval",
1294         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1295     { &hf_p2p_attr_p2p_group_id_dev_addr,
1296       { "P2P Device address", "wifi_p2p.p2p_group_id.p2p_dev_addr",
1297         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1298     { &hf_p2p_attr_p2p_group_id_ssid,
1299       { "SSID", "wifi_p2p.p2p_group_id.ssid",
1300         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1301     { &hf_p2p_attr_p2p_group_bssid,
1302       { "BSSID", "wifi_p2p.p2p_group_bssid",
1303         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1304
1305     { &hf_p2p_attr_noa_index,
1306       { "Index", "wifi_p2p.noa.index",
1307         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1308     { &hf_p2p_attr_noa_params,
1309       { "CTWindow and OppPS Parameters", "wifi_p2p.noa.params",
1310         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1311     { &hf_p2p_attr_noa_params_opp_ps,
1312       { "OppPS", "wifi_p2p.noa.params.opp_ps",
1313         FT_UINT8, BASE_DEC, NULL, 0x80, NULL, HFILL }},
1314     { &hf_p2p_attr_noa_params_ctwindow,
1315       { "CTWindow", "wifi_p2p.noa.params.ctwindow",
1316         FT_UINT8, BASE_DEC, NULL, 0x7f, NULL, HFILL }},
1317     { &hf_p2p_attr_noa_count_type,
1318       { "Count/Type", "wifi_p2p.noa.count_type",
1319         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1320     { &hf_p2p_attr_noa_duration,
1321       { "Duration", "wifi_p2p.noa.duration",
1322         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1323     { &hf_p2p_attr_noa_interval,
1324       { "Interval", "wifi_p2p.noa.interval",
1325         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1326     { &hf_p2p_attr_noa_start_time,
1327       { "Start Time", "wifi_p2p.noa.start_time",
1328         FT_UINT32, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1329
1330 #if 0
1331     { &hf_p2p_attr_gi,
1332       { "Device Info", "wifi_p2p.group_info",
1333         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1334 #endif
1335     { &hf_p2p_attr_gi_length,
1336       { "P2P Client Info Descriptor Length", "wifi_p2p.group_info.length",
1337         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1338     { &hf_p2p_attr_gi_p2p_dev_addr,
1339       { "P2P Device address", "wifi_p2p.group_info.p2p_dev_addr",
1340         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1341     { &hf_p2p_attr_gi_p2p_iface_addr,
1342       { "P2P Interface address", "wifi_p2p.group_info.p2p_interface_addr",
1343         FT_ETHER, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1344     { &hf_p2p_attr_gi_dev_capab,
1345       { "Device Capability Bitmap", "wifi_p2p.group_info.device_capability",
1346         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1347     { &hf_p2p_attr_gi_dev_capab_service_discovery,
1348       { "Service Discovery",
1349         "wifi_p2p.group_info.device_capability.service_discovery",
1350         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_SERVICE_DISCOVERY, NULL, HFILL
1351       }},
1352     { &hf_p2p_attr_gi_dev_capab_client_discoverability,
1353       { "P2P Client Discoverability",
1354         "wifi_p2p.group_info.device_capability.client_discoverability",
1355         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_CLIENT_DISCOVERABILITY,
1356         NULL, HFILL
1357       }},
1358     { &hf_p2p_attr_gi_dev_capab_concurrent_operation,
1359       { "Concurrent Operation",
1360         "wifi_p2p.group_info.device_capability.concurrent_operation",
1361         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_CONCURRENT_OPERATION, NULL,
1362         HFILL
1363       }},
1364     { &hf_p2p_attr_gi_dev_capab_infrastructure_managed,
1365       { "P2P Infrastructure Managed",
1366         "wifi_p2p.group_info.device_capability.infrastructure_managed",
1367         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_INFRASTRUCTURE_MANAGED,
1368         NULL, HFILL
1369       }},
1370     { &hf_p2p_attr_gi_dev_capab_limit,
1371       { "P2P Device Limit",
1372         "wifi_p2p.group_info.device_capability.device_limit",
1373         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_DEVICE_LIMIT, NULL, HFILL }},
1374 #if 0
1375     { &hf_p2p_attr_gi_dev_capab_invitation_procedure,
1376       { "P2P Invitation Procedure",
1377         "wifi_p2p.group_info.device_capability.invitation_procedure",
1378         FT_UINT8, BASE_HEX, NULL, P2P_DEV_CAPAB_P2P_INVITATION_PROCEDURE, NULL,
1379         HFILL }},
1380 #endif
1381     { &hf_p2p_attr_gi_pri_dev_type,
1382       { "Primary Device Type", "wifi_p2p.group_info.pri_dev_type",
1383         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1384     { &hf_p2p_attr_gi_pri_dev_type_category,
1385       { "Primary Device Type: Category",
1386         "wifi_p2p.group_info.pri_dev_type.category",
1387         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1388     { &hf_p2p_attr_gi_pri_dev_type_oui,
1389       { "Primary Device Type: OUI", "wifi_p2p.group_info.pri_dev_type.oui",
1390         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1391     { &hf_p2p_attr_gi_pri_dev_type_subcategory,
1392       { "Primary Device Type: Subcategory",
1393         "wifi_p2p.group_info.pri_dev_type.subcategory",
1394         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1395     { &hf_p2p_attr_gi_num_sec_dev_types,
1396       { "Number of Secondary Device Types", "wifi_p2p.group_info.num_sec",
1397         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1398     { &hf_p2p_attr_gi_sec_dev_type,
1399       { "Secondary Device Type", "wifi_p2p.group_info.sec_dev_type",
1400         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1401     { &hf_p2p_attr_gi_dev_name_type,
1402       { "Device Name attribute type", "wifi_p2p.group_info.dev_name_type",
1403         FT_UINT16, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1404     { &hf_p2p_attr_gi_dev_name_len,
1405       { "Device Name attribute length", "wifi_p2p.group_info.dev_name",
1406         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1407     { &hf_p2p_attr_gi_dev_name,
1408       { "Device Name", "wifi_p2p.group_info.dev_name",
1409         FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1410     { &hf_p2p_attr_gi_config_methods,
1411       { "Config Methods", "wifi_p2p.group_info.config_methods",
1412         FT_UINT16, BASE_HEX, NULL, 0, NULL, HFILL }},
1413 #if 0
1414     { &hf_p2p_attr_gi_config_methods_usba,
1415       { "USBA (Flash Drive)", "wifi_p2p.group_info.config_methods.usba",
1416         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_USBA, NULL, HFILL }},
1417 #endif
1418 #if 0
1419     { &hf_p2p_attr_gi_config_methods_ethernet,
1420       { "Ethernet", "wifi_p2p.group_info.config_methods.ethernet",
1421         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_ETHERNET, NULL, HFILL }},
1422 #endif
1423 #if 0
1424     { &hf_p2p_attr_gi_config_methods_label,
1425       { "Label", "wifi_p2p.group_info.config_methods.label",
1426         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_LABEL, NULL, HFILL }},
1427 #endif
1428 #if 0
1429     { &hf_p2p_attr_gi_config_methods_display,
1430       { "Display", "wifi_p2p.group_info.config_methods.display",
1431         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_DISPLAY, NULL, HFILL }},
1432 #endif
1433 #if 0
1434     { &hf_p2p_attr_gi_config_methods_ext_nfc_token,
1435       { "External NFC Token",
1436         "wifi_p2p.group_info.config_methods.ext_nfc_token",
1437         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_EXT_NFC_TOKEN, NULL, HFILL }},
1438 #endif
1439 #if 0
1440     { &hf_p2p_attr_gi_config_methods_int_nfc_token,
1441       { "Integrated NFC Token",
1442         "wifi_p2p.group_info.config_methods.int_nfc_token",
1443         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_INT_NFC_TOKEN, NULL, HFILL }},
1444 #endif
1445 #if 0
1446     { &hf_p2p_attr_gi_config_methods_nfc_interface,
1447       { "NFC Interface", "wifi_p2p.group_info.config_methods.nfc_interface",
1448         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_NFC_INTERFACE, NULL, HFILL }},
1449 #endif
1450 #if 0
1451     { &hf_p2p_attr_gi_config_methods_pushbutton,
1452       { "PushButton", "wifi_p2p.group_info.config_methods.pushbutton",
1453         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_PUSHBUTTON, NULL, HFILL }},
1454 #endif
1455 #if 0
1456     { &hf_p2p_attr_gi_config_methods_keypad,
1457       { "Keypad", "wifi_p2p.group_info.config_methods.keypad",
1458         FT_UINT16, BASE_HEX, NULL, WPS_CONF_METH_KEYPAD, NULL, HFILL }},
1459 #endif
1460
1461     { &hf_p2p_attr_invitation_flags,
1462       { "Invitation Flags", "wifi_p2p.invitation_flags",
1463         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1464     { &hf_p2p_attr_invitation_flags_type,
1465       { "Invitation Type", "wifi_p2p.invitation_flags.type",
1466         FT_UINT8, BASE_HEX, VALS(invitation_types), 0x01, NULL, HFILL }},
1467
1468     { &hf_p2p_attr_manageability_bitmap,
1469       { "Manageability Bitmap field", "wifi_p2p.manageability.bitmap",
1470         FT_UINT8, BASE_HEX, NULL, 0x0, NULL, HFILL }},
1471     { &hf_p2p_attr_manageability_bitmap_mgmt,
1472       { "P2P Device Management", "wifi_p2p.manageability.bitmap.dev_mgmt",
1473         FT_UINT8, BASE_HEX, NULL, 0x01, NULL, HFILL }},
1474     { &hf_p2p_attr_manageability_bitmap_cross_connect,
1475       { "Cross Connection Permitted",
1476         "wifi_p2p.manageability.bitmap.cross_connect",
1477         FT_UINT8, BASE_HEX, NULL, 0x02, NULL, HFILL }},
1478     { &hf_p2p_attr_manageability_bitmap_coex_opt,
1479       { "Coexistence Optional", "wifi_p2p.manageability.bitmap.coex_opt",
1480         FT_UINT8, BASE_HEX, NULL, 0x04, NULL, HFILL }},
1481
1482     { &hf_p2p_attr_minor_reason_code,
1483       { "Minor Reason Code", "wifi_p2p.minor_reason_code",
1484         FT_UINT8, BASE_DEC, VALS(p2p_minor_reason_codes), 0x0, NULL, HFILL }},
1485
1486     { &hf_p2p_anqp_service_update_indicator,
1487       { "Service Update Indicator", "wifi_p2p.anqp.service_update_indicator",
1488         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1489     { &hf_p2p_anqp_length,
1490       { "Length", "wifi_p2p.anqp.length",
1491         FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1492     { &hf_p2p_anqp_service_protocol_type,
1493       { "Service Protocol Type", "wifi_p2p.anqp.service_protocol_type",
1494         FT_UINT8, BASE_DEC, VALS(p2p_service_protocol_types), 0x0, NULL,
1495         HFILL }},
1496     { &hf_p2p_anqp_service_transaction_id,
1497       { "Service Transaction ID", "wifi_p2p.anqp.service_transaction_id",
1498         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1499     { &hf_p2p_anqp_query_data,
1500       { "Query Data", "wifi_p2p.anqp.query_data",
1501         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1502     { &hf_p2p_anqp_status_code,
1503       { "Status Code", "wifi_p2p.anqp.status_code",
1504         FT_UINT8, BASE_DEC, VALS(p2p_sd_status_codes), 0x0,
1505         "Service Query Status Code", HFILL }},
1506     { &hf_p2p_anqp_response_data,
1507       { "Response Data", "wifi_p2p.anqp.response_data",
1508         FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }},
1509
1510     { &hf_p2p_action_subtype,
1511       { "P2P Action Subtype", "wifi_p2p.action.subtype",
1512         FT_UINT8, BASE_DEC, VALS(p2p_action_subtypes), 0x0, NULL, HFILL }},
1513     { &hf_p2p_action_dialog_token,
1514       { "P2P Action Dialog Token", "wifi_p2p.action.dialog_token",
1515         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
1516     { &hf_p2p_public_action_subtype,
1517       { "P2P Public Action Subtype", "wifi_p2p.public_action.subtype",
1518         FT_UINT8, BASE_DEC, VALS(p2p_public_action_subtypes), 0x0, NULL, HFILL
1519       }},
1520     { &hf_p2p_public_action_dialog_token,
1521       { "P2P Public Action Dialog Token",
1522         "wifi_p2p.public_action.dialog_token",
1523         FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }}
1524   };
1525   static gint *ett[] = {
1526     &ett_p2p_tlv,
1527     &ett_p2p_service_tlv,
1528     &ett_p2p_client_descr
1529   };
1530
1531   static ei_register_info ei[] = {
1532       { &ei_wifi_p2p_attr_dev_info_dev_name_type, { "wifi_p2p.dev_info.dev_name_type.invalid", PI_MALFORMED, PI_ERROR, "Incorrect Device Name attribute type", EXPFILL }},
1533       { &ei_wifi_p2p_attr_len, { "wifi_p2p.length.invalid", PI_MALFORMED, PI_ERROR, "Invalid attribute length", EXPFILL }},
1534       { &ei_wifi_p2p_anqp_length, { "wifi_p2p.anqp.length.invalid", PI_MALFORMED, PI_ERROR, "Invalid anqp_length", EXPFILL }},
1535       { &ei_wifi_p2p_anqp_unexpected_padding, { "wifi_p2p.anqp.unexpected_padding", PI_MALFORMED, PI_ERROR, "Unexpected padding in the end of P2P ANQP", EXPFILL }},
1536   };
1537
1538   expert_module_t* expert_p2p;
1539
1540   proto_p2p = proto_register_protocol("Wi-Fi Peer-to-Peer", "Wi-Fi P2P", "wifi_p2p");
1541   proto_register_field_array(proto_p2p, hf, array_length(hf));
1542   proto_register_subtree_array(ett, array_length(ett));
1543
1544   expert_p2p = expert_register_protocol(proto_p2p);
1545   expert_register_field_array(expert_p2p, ei, array_length(ei));
1546 }
1547
1548 /*
1549  * Editor modelines
1550  *
1551  * Local Variables:
1552  * c-basic-offset: 2
1553  * tab-width: 8
1554  * indent-tabs-mode: nil
1555  * End:
1556  *
1557  * ex: set shiftwidth=2 tabstop=8 expandtab:
1558  * :indentSize=2:tabSize=8:noTabs=true:
1559  */