2 * WPA Supplicant / dbus-based control interface (P2P)
3 * Copyright (c) 2011-2012, Intel Corporation
5 * This software may be distributed under the terms of the BSD license.
6 * See README for more details.
11 #include "utils/includes.h"
13 #include "../config.h"
14 #include "../wpa_supplicant_i.h"
15 #include "../wps_supplicant.h"
16 #include "../notify.h"
17 #include "dbus_new_helpers.h"
19 #include "dbus_new_handlers.h"
20 #include "dbus_new_handlers_p2p.h"
21 #include "dbus_dict_helpers.h"
23 #include "common/ieee802_11_defs.h"
24 #include "ap/hostapd.h"
25 #include "ap/ap_config.h"
26 #include "ap/wps_hostapd.h"
28 #include "../p2p_supplicant.h"
31 * Parses out the mac address from the peer object path.
32 * @peer_path - object path of the form
33 * /fi/w1/wpa_supplicant1/Interfaces/n/Peers/00112233445566 (no colons)
34 * @addr - out param must be of ETH_ALEN size
35 * Returns 0 if valid (including MAC), -1 otherwise
37 static int parse_peer_object_path(char *peer_path, u8 addr[ETH_ALEN])
43 p = os_strrchr(peer_path, '/');
47 return hwaddr_compact_aton(p, addr);
52 * wpas_dbus_error_persistent_group_unknown - Return a new PersistentGroupUnknown
54 * @message: Pointer to incoming dbus message this error refers to
55 * Returns: a dbus error message
57 * Convenience function to create and return an invalid persistent group error.
59 static DBusMessage * wpas_dbus_error_persistent_group_unknown(
62 return dbus_message_new_error(message, WPAS_DBUS_ERROR_NETWORK_UNKNOWN,
63 "There is no such persistent group in "
68 DBusMessage * wpas_dbus_handler_p2p_find(DBusMessage *message,
69 struct wpa_supplicant *wpa_s)
71 struct wpa_dbus_dict_entry entry;
72 DBusMessage *reply = NULL;
74 DBusMessageIter iter_dict;
75 unsigned int timeout = 0;
76 enum p2p_discovery_type type = P2P_FIND_ONLY_SOCIAL;
77 int num_req_dev_types = 0;
79 u8 *req_dev_types = NULL;
81 dbus_message_iter_init(message, &iter);
84 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
87 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
88 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
91 if (!os_strcmp(entry.key, "Timeout") &&
92 (entry.type == DBUS_TYPE_INT32)) {
93 timeout = entry.uint32_value;
94 } else if (os_strcmp(entry.key, "RequestedDeviceTypes") == 0) {
95 if ((entry.type != DBUS_TYPE_ARRAY) ||
96 (entry.array_type != WPAS_DBUS_TYPE_BINARRAY))
99 os_free(req_dev_types);
101 os_malloc(WPS_DEV_TYPE_LEN * entry.array_len);
105 for (i = 0; i < entry.array_len; i++) {
106 if (wpabuf_len(entry.binarray_value[i]) !=
109 os_memcpy(req_dev_types + i * WPS_DEV_TYPE_LEN,
110 wpabuf_head(entry.binarray_value[i]),
113 num_req_dev_types = entry.array_len;
114 } else if (!os_strcmp(entry.key, "DiscoveryType") &&
115 (entry.type == DBUS_TYPE_STRING)) {
116 if (!os_strcmp(entry.str_value, "start_with_full"))
117 type = P2P_FIND_START_WITH_FULL;
118 else if (!os_strcmp(entry.str_value, "social"))
119 type = P2P_FIND_ONLY_SOCIAL;
120 else if (!os_strcmp(entry.str_value, "progressive"))
121 type = P2P_FIND_PROGRESSIVE;
126 wpa_dbus_dict_entry_clear(&entry);
129 wpas_p2p_find(wpa_s, timeout, type, num_req_dev_types, req_dev_types,
131 os_free(req_dev_types);
135 wpa_dbus_dict_entry_clear(&entry);
137 os_free(req_dev_types);
138 reply = wpas_dbus_error_invalid_args(message, entry.key);
143 DBusMessage * wpas_dbus_handler_p2p_stop_find(DBusMessage *message,
144 struct wpa_supplicant *wpa_s)
146 wpas_p2p_stop_find(wpa_s);
151 DBusMessage * wpas_dbus_handler_p2p_rejectpeer(DBusMessage *message,
152 struct wpa_supplicant *wpa_s)
154 DBusMessageIter iter;
155 char *peer_object_path = NULL;
156 u8 peer_addr[ETH_ALEN];
158 dbus_message_iter_init(message, &iter);
159 dbus_message_iter_get_basic(&iter, &peer_object_path);
161 if (parse_peer_object_path(peer_object_path, peer_addr) < 0)
162 return wpas_dbus_error_invalid_args(message, NULL);
164 if (wpas_p2p_reject(wpa_s, peer_addr) < 0)
165 return wpas_dbus_error_unknown_error(message,
166 "Failed to call wpas_p2p_reject method.");
172 DBusMessage * wpas_dbus_handler_p2p_listen(DBusMessage *message,
173 struct wpa_supplicant *wpa_s)
175 dbus_int32_t timeout = 0;
177 if (!dbus_message_get_args(message, NULL, DBUS_TYPE_INT32, &timeout,
179 return dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
182 if (wpas_p2p_listen(wpa_s, (unsigned int)timeout))
183 return dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
190 DBusMessage * wpas_dbus_handler_p2p_extendedlisten(
191 DBusMessage *message, struct wpa_supplicant *wpa_s)
193 unsigned int period = 0, interval = 0;
194 struct wpa_dbus_dict_entry entry;
195 DBusMessageIter iter;
196 DBusMessageIter iter_dict;
198 dbus_message_iter_init(message, &iter);
201 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
204 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
205 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
208 if (!os_strcmp(entry.key, "period") &&
209 (entry.type == DBUS_TYPE_INT32))
210 period = entry.uint32_value;
211 else if (!os_strcmp(entry.key, "interval") &&
212 (entry.type == DBUS_TYPE_INT32))
213 interval = entry.uint32_value;
216 wpa_dbus_dict_entry_clear(&entry);
219 if (wpas_p2p_ext_listen(wpa_s, period, interval))
220 return wpas_dbus_error_unknown_error(
221 message, "failed to initiate a p2p_ext_listen.");
226 wpa_dbus_dict_entry_clear(&entry);
228 return wpas_dbus_error_invalid_args(message, entry.key);
232 DBusMessage * wpas_dbus_handler_p2p_presence_request(
233 DBusMessage *message, struct wpa_supplicant *wpa_s)
235 unsigned int dur1 = 0, int1 = 0, dur2 = 0, int2 = 0;
236 struct wpa_dbus_dict_entry entry;
237 DBusMessageIter iter;
238 DBusMessageIter iter_dict;
240 dbus_message_iter_init(message, &iter);
243 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
246 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
247 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
250 if (!os_strcmp(entry.key, "duration1") &&
251 (entry.type == DBUS_TYPE_INT32))
252 dur1 = entry.uint32_value;
253 else if (!os_strcmp(entry.key, "interval1") &&
254 entry.type == DBUS_TYPE_INT32)
255 int1 = entry.uint32_value;
256 else if (!os_strcmp(entry.key, "duration2") &&
257 entry.type == DBUS_TYPE_INT32)
258 dur2 = entry.uint32_value;
259 else if (!os_strcmp(entry.key, "interval2") &&
260 entry.type == DBUS_TYPE_INT32)
261 int2 = entry.uint32_value;
265 wpa_dbus_dict_entry_clear(&entry);
267 if (wpas_p2p_presence_req(wpa_s, dur1, int1, dur2, int2) < 0)
268 return wpas_dbus_error_unknown_error(message,
269 "Failed to invoke presence request.");
274 wpa_dbus_dict_entry_clear(&entry);
276 return wpas_dbus_error_invalid_args(message, entry.key);
280 DBusMessage * wpas_dbus_handler_p2p_group_add(DBusMessage *message,
281 struct wpa_supplicant *wpa_s)
283 DBusMessageIter iter_dict;
284 DBusMessage *reply = NULL;
285 DBusMessageIter iter;
286 struct wpa_dbus_dict_entry entry;
287 char *pg_object_path = NULL;
288 int persistent_group = 0;
291 char *net_id_str = NULL;
292 unsigned int group_id = 0;
293 struct wpa_ssid *ssid;
295 dbus_message_iter_init(message, &iter);
297 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
300 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
301 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
304 if (!os_strcmp(entry.key, "persistent") &&
305 (entry.type == DBUS_TYPE_BOOLEAN)) {
306 persistent_group = (entry.bool_value == TRUE) ? 1 : 0;
307 } else if (!os_strcmp(entry.key, "frequency") &&
308 (entry.type == DBUS_TYPE_INT32)) {
309 freq = entry.int32_value;
312 } else if (!os_strcmp(entry.key, "persistent_group_object") &&
313 entry.type == DBUS_TYPE_OBJECT_PATH)
314 pg_object_path = os_strdup(entry.str_value);
318 wpa_dbus_dict_entry_clear(&entry);
321 if (pg_object_path != NULL) {
323 * A persistent group Object Path is defined meaning we want
324 * to re-invoke a persistent group.
327 iface = wpas_dbus_new_decompose_object_path(pg_object_path, 1,
330 os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
332 wpas_dbus_error_invalid_args(message,
337 group_id = strtoul(net_id_str, NULL, 10);
338 if (errno == EINVAL) {
339 reply = wpas_dbus_error_invalid_args(
340 message, pg_object_path);
344 /* Get the SSID structure from the persistent group id */
345 ssid = wpa_config_get_network(wpa_s->conf, group_id);
346 if (ssid == NULL || ssid->disabled != 2)
349 if (wpas_p2p_group_add_persistent(wpa_s, ssid, 0, freq, 0, 0, 0,
351 reply = wpas_dbus_error_unknown_error(
353 "Failed to reinvoke a persistent group");
356 } else if (wpas_p2p_group_add(wpa_s, persistent_group, freq, 0, 0))
360 os_free(pg_object_path);
365 wpa_dbus_dict_entry_clear(&entry);
367 reply = wpas_dbus_error_invalid_args(message, NULL);
372 DBusMessage * wpas_dbus_handler_p2p_disconnect(DBusMessage *message,
373 struct wpa_supplicant *wpa_s)
375 if (wpas_p2p_disconnect(wpa_s))
376 return wpas_dbus_error_unknown_error(message,
377 "failed to disconnect");
383 static dbus_bool_t wpa_dbus_p2p_check_enabled(struct wpa_supplicant *wpa_s,
384 DBusMessage *message,
385 DBusMessage **out_reply,
388 /* Return an error message or an error if P2P isn't available */
389 if (wpa_s->global->p2p_disabled || wpa_s->global->p2p == NULL) {
391 *out_reply = dbus_message_new_error(
392 message, DBUS_ERROR_FAILED,
393 "P2P is not available for this interface");
395 dbus_set_error_const(error, DBUS_ERROR_FAILED,
396 "P2P is not available for this "
404 DBusMessage * wpas_dbus_handler_p2p_flush(DBusMessage *message,
405 struct wpa_supplicant *wpa_s)
407 DBusMessage *reply = NULL;
409 if (!wpa_dbus_p2p_check_enabled(wpa_s, message, &reply, NULL))
412 os_memset(wpa_s->p2p_auth_invite, 0, ETH_ALEN);
413 wpa_s->force_long_sd = 0;
414 p2p_flush(wpa_s->global->p2p);
420 DBusMessage * wpas_dbus_handler_p2p_connect(DBusMessage *message,
421 struct wpa_supplicant *wpa_s)
423 DBusMessageIter iter_dict;
424 DBusMessage *reply = NULL;
425 DBusMessageIter iter;
426 struct wpa_dbus_dict_entry entry;
427 char *peer_object_path = NULL;
428 int persistent_group = 0;
430 int authorize_only = 0;
435 enum p2p_wps_method wps_method = WPS_NOT_READY;
437 char *err_msg = NULL;
440 if (!wpa_dbus_p2p_check_enabled(wpa_s, message, &reply, NULL))
443 dbus_message_iter_init(message, &iter);
445 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
448 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
449 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
452 if (!os_strcmp(entry.key, "peer") &&
453 (entry.type == DBUS_TYPE_OBJECT_PATH)) {
454 peer_object_path = os_strdup(entry.str_value);
455 } else if (!os_strcmp(entry.key, "persistent") &&
456 (entry.type == DBUS_TYPE_BOOLEAN)) {
457 persistent_group = (entry.bool_value == TRUE) ? 1 : 0;
458 } else if (!os_strcmp(entry.key, "join") &&
459 (entry.type == DBUS_TYPE_BOOLEAN)) {
460 join = (entry.bool_value == TRUE) ? 1 : 0;
461 } else if (!os_strcmp(entry.key, "authorize_only") &&
462 (entry.type == DBUS_TYPE_BOOLEAN)) {
463 authorize_only = (entry.bool_value == TRUE) ? 1 : 0;
464 } else if (!os_strcmp(entry.key, "frequency") &&
465 (entry.type == DBUS_TYPE_INT32)) {
466 freq = entry.int32_value;
469 } else if (!os_strcmp(entry.key, "go_intent") &&
470 (entry.type == DBUS_TYPE_INT32)) {
471 go_intent = entry.int32_value;
472 if ((go_intent < 0) || (go_intent > 15))
474 } else if (!os_strcmp(entry.key, "wps_method") &&
475 (entry.type == DBUS_TYPE_STRING)) {
476 if (!os_strcmp(entry.str_value, "pbc"))
477 wps_method = WPS_PBC;
478 else if (!os_strcmp(entry.str_value, "pin"))
479 wps_method = WPS_PIN_DISPLAY;
480 else if (!os_strcmp(entry.str_value, "display"))
481 wps_method = WPS_PIN_DISPLAY;
482 else if (!os_strcmp(entry.str_value, "keypad"))
483 wps_method = WPS_PIN_KEYPAD;
486 } else if (!os_strcmp(entry.key, "pin") &&
487 (entry.type == DBUS_TYPE_STRING)) {
488 pin = os_strdup(entry.str_value);
492 wpa_dbus_dict_entry_clear(&entry);
495 if (!peer_object_path || (wps_method == WPS_NOT_READY) ||
496 (parse_peer_object_path(peer_object_path, addr) < 0) ||
497 !p2p_peer_known(wpa_s->global->p2p, addr))
501 * Validate the wps_method specified and the pin value.
503 if ((!pin || !pin[0]) && (wps_method == WPS_PIN_KEYPAD))
506 new_pin = wpas_p2p_connect(wpa_s, addr, pin, wps_method,
507 persistent_group, 0, join, authorize_only,
508 go_intent, freq, -1, 0, 0, 0);
513 os_snprintf(npin, sizeof(npin), "%08d", new_pin);
514 generated_pin = npin;
515 reply = dbus_message_new_method_return(message);
516 dbus_message_append_args(reply, DBUS_TYPE_STRING,
517 &generated_pin, DBUS_TYPE_INVALID);
521 err_msg = "connect failed due to channel "
523 iface = WPAS_DBUS_ERROR_CONNECT_CHANNEL_UNAVAILABLE;
527 err_msg = "connect failed due to unsupported channel.";
528 iface = WPAS_DBUS_ERROR_CONNECT_CHANNEL_UNSUPPORTED;
532 err_msg = "connect failed due to unspecified error.";
533 iface = WPAS_DBUS_ERROR_CONNECT_UNSPECIFIED_ERROR;
539 * Do we need specialized errors corresponding to above
540 * error conditions as against just returning a different
543 reply = dbus_message_new_error(message, iface, err_msg);
547 os_free(peer_object_path);
551 wpa_dbus_dict_entry_clear(&entry);
553 reply = wpas_dbus_error_invalid_args(message, NULL);
558 DBusMessage * wpas_dbus_handler_p2p_invite(DBusMessage *message,
559 struct wpa_supplicant *wpa_s)
561 DBusMessageIter iter_dict;
562 DBusMessage *reply = NULL;
563 DBusMessageIter iter;
564 struct wpa_dbus_dict_entry entry;
565 char *peer_object_path = NULL;
566 char *pg_object_path = NULL;
568 char *net_id_str = NULL;
569 u8 peer_addr[ETH_ALEN];
570 unsigned int group_id = 0;
572 struct wpa_ssid *ssid;
574 if (!wpa_dbus_p2p_check_enabled(wpa_s, message, &reply, NULL))
577 dbus_message_iter_init(message, &iter);
579 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
582 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
583 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
586 if (!os_strcmp(entry.key, "peer") &&
587 (entry.type == DBUS_TYPE_OBJECT_PATH)) {
588 peer_object_path = os_strdup(entry.str_value);
589 wpa_dbus_dict_entry_clear(&entry);
590 } else if (!os_strcmp(entry.key, "persistent_group_object") &&
591 (entry.type == DBUS_TYPE_OBJECT_PATH)) {
592 pg_object_path = os_strdup(entry.str_value);
594 wpa_dbus_dict_entry_clear(&entry);
596 wpa_dbus_dict_entry_clear(&entry);
601 if (!peer_object_path ||
602 (parse_peer_object_path(peer_object_path, peer_addr) < 0) ||
603 !p2p_peer_known(wpa_s->global->p2p, peer_addr)) {
609 * A group ID is defined meaning we want to re-invoke a
613 iface = wpas_dbus_new_decompose_object_path(pg_object_path, 1,
616 os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
617 reply = wpas_dbus_error_invalid_args(message,
622 group_id = strtoul(net_id_str, NULL, 10);
623 if (errno == EINVAL) {
624 reply = wpas_dbus_error_invalid_args(
625 message, pg_object_path);
629 /* Get the SSID structure from the persistent group id */
630 ssid = wpa_config_get_network(wpa_s->conf, group_id);
631 if (ssid == NULL || ssid->disabled != 2)
634 if (wpas_p2p_invite(wpa_s, peer_addr, ssid, NULL, 0, 0, 0, 0) <
636 reply = wpas_dbus_error_unknown_error(
638 "Failed to reinvoke a persistent group");
643 * No group ID means propose to a peer to join my active group
645 if (wpas_p2p_invite_group(wpa_s, wpa_s->ifname,
647 reply = wpas_dbus_error_unknown_error(
648 message, "Failed to join to an active group");
654 os_free(pg_object_path);
655 os_free(peer_object_path);
659 reply = wpas_dbus_error_invalid_args(message, NULL);
664 DBusMessage * wpas_dbus_handler_p2p_prov_disc_req(DBusMessage *message,
665 struct wpa_supplicant *wpa_s)
667 DBusMessageIter iter;
668 char *peer_object_path = NULL;
669 char *config_method = NULL;
670 u8 peer_addr[ETH_ALEN];
672 dbus_message_iter_init(message, &iter);
673 dbus_message_iter_get_basic(&iter, &peer_object_path);
675 if (parse_peer_object_path(peer_object_path, peer_addr) < 0)
676 return wpas_dbus_error_invalid_args(message, NULL);
678 dbus_message_iter_next(&iter);
679 dbus_message_iter_get_basic(&iter, &config_method);
682 * Validation checks on config_method are being duplicated here
683 * to be able to return invalid args reply since the error code
684 * from p2p module are not granular enough (yet).
686 if (os_strcmp(config_method, "display") &&
687 os_strcmp(config_method, "keypad") &&
688 os_strcmp(config_method, "pbc") &&
689 os_strcmp(config_method, "pushbutton"))
690 return wpas_dbus_error_invalid_args(message, NULL);
692 if (wpas_p2p_prov_disc(wpa_s, peer_addr, config_method,
693 WPAS_P2P_PD_FOR_GO_NEG) < 0)
694 return wpas_dbus_error_unknown_error(message,
695 "Failed to send provision discovery request");
702 * P2P Device property accessor methods.
705 dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter,
709 struct wpa_supplicant *wpa_s = user_data;
710 DBusMessageIter variant_iter, dict_iter;
711 DBusMessageIter iter_secdev_dict_entry, iter_secdev_dict_val,
712 iter_secdev_dict_array;
713 const char *dev_name;
714 int num_vendor_extensions = 0;
716 const struct wpabuf *vendor_ext[P2P_MAX_WPS_VENDOR_EXT];
718 if (!wpa_dbus_p2p_check_enabled(wpa_s, NULL, NULL, error))
721 if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
722 "a{sv}", &variant_iter) ||
723 !wpa_dbus_dict_open_write(&variant_iter, &dict_iter))
727 dev_name = wpa_s->conf->device_name;
729 !wpa_dbus_dict_append_string(&dict_iter, "DeviceName", dev_name))
732 /* Primary device type */
733 if (!wpa_dbus_dict_append_byte_array(&dict_iter, "PrimaryDeviceType",
734 (char *)wpa_s->conf->device_type,
738 /* Secondary device types */
739 if (wpa_s->conf->num_sec_device_types) {
740 if (!wpa_dbus_dict_begin_array(&dict_iter,
741 "SecondaryDeviceTypes",
742 DBUS_TYPE_ARRAY_AS_STRING
743 DBUS_TYPE_BYTE_AS_STRING,
744 &iter_secdev_dict_entry,
745 &iter_secdev_dict_val,
746 &iter_secdev_dict_array))
749 for (i = 0; i < wpa_s->conf->num_sec_device_types; i++)
750 wpa_dbus_dict_bin_array_add_element(
751 &iter_secdev_dict_array,
752 wpa_s->conf->sec_device_type[i],
755 if (!wpa_dbus_dict_end_array(&dict_iter,
756 &iter_secdev_dict_entry,
757 &iter_secdev_dict_val,
758 &iter_secdev_dict_array))
762 /* Vendor Extensions */
763 for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
764 if (wpa_s->conf->wps_vendor_ext[i] == NULL)
766 vendor_ext[num_vendor_extensions++] =
767 wpa_s->conf->wps_vendor_ext[i];
770 if (num_vendor_extensions &&
771 !wpa_dbus_dict_append_wpabuf_array(&dict_iter,
774 num_vendor_extensions))
778 if (!wpa_dbus_dict_append_uint32(&dict_iter, "GOIntent",
779 wpa_s->conf->p2p_go_intent))
782 /* Persistent Reconnect */
783 if (!wpa_dbus_dict_append_bool(&dict_iter, "PersistentReconnect",
784 wpa_s->conf->persistent_reconnect))
787 /* Listen Reg Class */
788 if (!wpa_dbus_dict_append_uint32(&dict_iter, "ListenRegClass",
789 wpa_s->conf->p2p_listen_reg_class))
793 if (!wpa_dbus_dict_append_uint32(&dict_iter, "ListenChannel",
794 wpa_s->conf->p2p_listen_channel))
798 if (!wpa_dbus_dict_append_uint32(&dict_iter, "OperRegClass",
799 wpa_s->conf->p2p_oper_reg_class))
803 if (!wpa_dbus_dict_append_uint32(&dict_iter, "OperChannel",
804 wpa_s->conf->p2p_oper_channel))
808 if (wpa_s->conf->p2p_ssid_postfix &&
809 !wpa_dbus_dict_append_string(&dict_iter, "SsidPostfix",
810 wpa_s->conf->p2p_ssid_postfix))
814 if (!wpa_dbus_dict_append_bool(&dict_iter, "IntraBss",
815 wpa_s->conf->p2p_intra_bss))
819 if (!wpa_dbus_dict_append_uint32(&dict_iter, "GroupIdle",
820 wpa_s->conf->p2p_group_idle))
823 /* Dissasociation low ack */
824 if (!wpa_dbus_dict_append_uint32(&dict_iter, "disassoc_low_ack",
825 wpa_s->conf->disassoc_low_ack))
829 if (!wpa_dbus_dict_append_bool(&dict_iter, "NoGroupIface",
830 wpa_s->conf->p2p_no_group_iface))
833 if (!wpa_dbus_dict_close_write(&variant_iter, &dict_iter) ||
834 !dbus_message_iter_close_container(iter, &variant_iter))
837 /* P2P Search Delay */
838 if (!wpa_dbus_dict_append_uint32(&dict_iter, "p2p_search_delay",
839 wpa_s->conf->p2p_search_delay))
845 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
850 dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter,
854 struct wpa_supplicant *wpa_s = user_data;
855 DBusMessageIter variant_iter, iter_dict;
856 struct wpa_dbus_dict_entry entry = {.type = DBUS_TYPE_STRING };
859 if (!wpa_dbus_p2p_check_enabled(wpa_s, NULL, NULL, error))
862 dbus_message_iter_recurse(iter, &variant_iter);
863 if (!wpa_dbus_dict_open_read(&variant_iter, &iter_dict, error))
866 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
867 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry)) {
868 dbus_set_error_const(error, DBUS_ERROR_INVALID_ARGS,
869 "invalid message format");
873 if (os_strcmp(entry.key, "DeviceName") == 0) {
876 if (entry.type != DBUS_TYPE_STRING)
879 devname = os_strdup(entry.str_value);
881 goto err_no_mem_clear;
883 os_free(wpa_s->conf->device_name);
884 wpa_s->conf->device_name = devname;
886 wpa_s->conf->changed_parameters |=
887 CFG_CHANGED_DEVICE_NAME;
888 } else if (os_strcmp(entry.key, "PrimaryDeviceType") == 0) {
889 if (entry.type != DBUS_TYPE_ARRAY ||
890 entry.array_type != DBUS_TYPE_BYTE ||
891 entry.array_len != WPS_DEV_TYPE_LEN)
894 os_memcpy(wpa_s->conf->device_type,
895 entry.bytearray_value,
897 wpa_s->conf->changed_parameters |=
898 CFG_CHANGED_DEVICE_TYPE;
899 } else if (os_strcmp(entry.key, "SecondaryDeviceTypes") == 0) {
900 if (entry.type != DBUS_TYPE_ARRAY ||
901 entry.array_type != WPAS_DBUS_TYPE_BINARRAY ||
902 entry.array_len > MAX_SEC_DEVICE_TYPES)
905 for (i = 0; i < entry.array_len; i++)
906 if (wpabuf_len(entry.binarray_value[i]) !=
908 goto err_no_mem_clear;
909 for (i = 0; i < entry.array_len; i++)
910 os_memcpy(wpa_s->conf->sec_device_type[i],
911 wpabuf_head(entry.binarray_value[i]),
913 wpa_s->conf->num_sec_device_types = entry.array_len;
914 wpa_s->conf->changed_parameters |=
915 CFG_CHANGED_SEC_DEVICE_TYPE;
916 } else if (os_strcmp(entry.key, "VendorExtension") == 0) {
917 if ((entry.type != DBUS_TYPE_ARRAY) ||
918 (entry.array_type != WPAS_DBUS_TYPE_BINARRAY) ||
919 (entry.array_len > P2P_MAX_WPS_VENDOR_EXT))
922 wpa_s->conf->changed_parameters |=
923 CFG_CHANGED_VENDOR_EXTENSION;
925 for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
926 wpabuf_free(wpa_s->conf->wps_vendor_ext[i]);
927 if (i < entry.array_len) {
928 wpa_s->conf->wps_vendor_ext[i] =
929 entry.binarray_value[i];
930 entry.binarray_value[i] = NULL;
932 wpa_s->conf->wps_vendor_ext[i] = NULL;
934 } else if ((os_strcmp(entry.key, "GOIntent") == 0) &&
935 (entry.type == DBUS_TYPE_UINT32) &&
936 (entry.uint32_value <= 15))
937 wpa_s->conf->p2p_go_intent = entry.uint32_value;
938 else if ((os_strcmp(entry.key, "PersistentReconnect") == 0) &&
939 (entry.type == DBUS_TYPE_BOOLEAN))
940 wpa_s->conf->persistent_reconnect = entry.bool_value;
941 else if ((os_strcmp(entry.key, "ListenRegClass") == 0) &&
942 (entry.type == DBUS_TYPE_UINT32)) {
943 wpa_s->conf->p2p_listen_reg_class = entry.uint32_value;
944 wpa_s->conf->changed_parameters |=
945 CFG_CHANGED_P2P_LISTEN_CHANNEL;
946 } else if ((os_strcmp(entry.key, "ListenChannel") == 0) &&
947 (entry.type == DBUS_TYPE_UINT32)) {
948 wpa_s->conf->p2p_listen_channel = entry.uint32_value;
949 wpa_s->conf->changed_parameters |=
950 CFG_CHANGED_P2P_LISTEN_CHANNEL;
951 } else if ((os_strcmp(entry.key, "OperRegClass") == 0) &&
952 (entry.type == DBUS_TYPE_UINT32)) {
953 wpa_s->conf->p2p_oper_reg_class = entry.uint32_value;
954 wpa_s->conf->changed_parameters |=
955 CFG_CHANGED_P2P_OPER_CHANNEL;
956 } else if ((os_strcmp(entry.key, "OperChannel") == 0) &&
957 (entry.type == DBUS_TYPE_UINT32)) {
958 wpa_s->conf->p2p_oper_channel = entry.uint32_value;
959 wpa_s->conf->changed_parameters |=
960 CFG_CHANGED_P2P_OPER_CHANNEL;
961 } else if (os_strcmp(entry.key, "SsidPostfix") == 0) {
964 if (entry.type != DBUS_TYPE_STRING)
967 postfix = os_strdup(entry.str_value);
969 goto err_no_mem_clear;
971 os_free(wpa_s->conf->p2p_ssid_postfix);
972 wpa_s->conf->p2p_ssid_postfix = postfix;
974 wpa_s->conf->changed_parameters |=
975 CFG_CHANGED_P2P_SSID_POSTFIX;
976 } else if ((os_strcmp(entry.key, "IntraBss") == 0) &&
977 (entry.type == DBUS_TYPE_BOOLEAN)) {
978 wpa_s->conf->p2p_intra_bss = entry.bool_value;
979 wpa_s->conf->changed_parameters |=
980 CFG_CHANGED_P2P_INTRA_BSS;
981 } else if ((os_strcmp(entry.key, "GroupIdle") == 0) &&
982 (entry.type == DBUS_TYPE_UINT32))
983 wpa_s->conf->p2p_group_idle = entry.uint32_value;
984 else if (os_strcmp(entry.key, "disassoc_low_ack") == 0 &&
985 entry.type == DBUS_TYPE_UINT32)
986 wpa_s->conf->disassoc_low_ack = entry.uint32_value;
987 else if (os_strcmp(entry.key, "NoGroupIface") == 0 &&
988 entry.type == DBUS_TYPE_BOOLEAN)
989 wpa_s->conf->p2p_no_group_iface = entry.bool_value;
990 else if (os_strcmp(entry.key, "p2p_search_delay") == 0 &&
991 entry.type == DBUS_TYPE_UINT32)
992 wpa_s->conf->p2p_search_delay = entry.uint32_value;
996 wpa_dbus_dict_entry_clear(&entry);
999 if (wpa_s->conf->changed_parameters) {
1000 /* Some changed parameters requires to update config*/
1001 wpa_supplicant_update_config(wpa_s);
1007 dbus_set_error_const(error, DBUS_ERROR_INVALID_ARGS,
1008 "invalid message format");
1009 wpa_dbus_dict_entry_clear(&entry);
1013 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1014 wpa_dbus_dict_entry_clear(&entry);
1019 dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error,
1022 struct wpa_supplicant *wpa_s = user_data;
1023 struct p2p_data *p2p = wpa_s->global->p2p;
1024 int next = 0, i = 0;
1025 int num = 0, out_of_mem = 0;
1027 const struct p2p_peer_info *peer_info = NULL;
1028 dbus_bool_t success = FALSE;
1030 struct dl_list peer_objpath_list;
1031 struct peer_objpath_node {
1032 struct dl_list list;
1033 char path[WPAS_DBUS_OBJECT_PATH_MAX];
1036 char **peer_obj_paths = NULL;
1038 if (!wpa_dbus_p2p_check_enabled(wpa_s, NULL, NULL, error))
1041 dl_list_init(&peer_objpath_list);
1043 /* Get the first peer info */
1044 peer_info = p2p_get_peer_found(p2p, NULL, next);
1046 /* Get next and accumulate them */
1048 while (peer_info != NULL) {
1049 node = os_zalloc(sizeof(struct peer_objpath_node));
1055 addr = peer_info->p2p_device_addr;
1056 os_snprintf(node->path, WPAS_DBUS_OBJECT_PATH_MAX,
1057 "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART
1059 wpa_s->dbus_new_path, MAC2STR(addr));
1060 dl_list_add_tail(&peer_objpath_list, &node->list);
1063 peer_info = p2p_get_peer_found(p2p, addr, next);
1067 * Now construct the peer object paths in a form suitable for
1068 * array_property_getter helper below.
1070 peer_obj_paths = os_calloc(num, sizeof(char *));
1072 if (!peer_obj_paths) {
1077 dl_list_for_each_safe(node, tmp, &peer_objpath_list,
1078 struct peer_objpath_node, list)
1079 peer_obj_paths[i++] = node->path;
1081 success = wpas_dbus_simple_array_property_getter(iter,
1082 DBUS_TYPE_OBJECT_PATH,
1083 peer_obj_paths, num,
1088 os_free(peer_obj_paths);
1090 dl_list_for_each_safe(node, tmp, &peer_objpath_list,
1091 struct peer_objpath_node, list) {
1092 dl_list_del(&node->list);
1096 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1102 enum wpas_p2p_role {
1103 WPAS_P2P_ROLE_DEVICE,
1105 WPAS_P2P_ROLE_CLIENT,
1108 static enum wpas_p2p_role wpas_get_p2p_role(struct wpa_supplicant *wpa_s)
1110 struct wpa_ssid *ssid = wpa_s->current_ssid;
1113 return WPAS_P2P_ROLE_DEVICE;
1114 if (wpa_s->wpa_state != WPA_COMPLETED)
1115 return WPAS_P2P_ROLE_DEVICE;
1117 switch (ssid->mode) {
1118 case WPAS_MODE_P2P_GO:
1119 case WPAS_MODE_P2P_GROUP_FORMATION:
1120 return WPAS_P2P_ROLE_GO;
1121 case WPAS_MODE_INFRA:
1122 if (ssid->p2p_group)
1123 return WPAS_P2P_ROLE_CLIENT;
1124 return WPAS_P2P_ROLE_DEVICE;
1126 return WPAS_P2P_ROLE_DEVICE;
1131 dbus_bool_t wpas_dbus_getter_p2p_role(DBusMessageIter *iter, DBusError *error,
1134 struct wpa_supplicant *wpa_s = user_data;
1137 switch (wpas_get_p2p_role(wpa_s)) {
1138 case WPAS_P2P_ROLE_GO:
1141 case WPAS_P2P_ROLE_CLIENT:
1149 return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, &str,
1154 dbus_bool_t wpas_dbus_getter_p2p_group(DBusMessageIter *iter, DBusError *error,
1157 struct wpa_supplicant *wpa_s = user_data;
1158 char path_buf[WPAS_DBUS_OBJECT_PATH_MAX];
1159 char *dbus_groupobj_path = path_buf;
1161 if (wpa_s->dbus_groupobj_path == NULL)
1162 os_snprintf(dbus_groupobj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1165 os_snprintf(dbus_groupobj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1166 "%s", wpa_s->dbus_groupobj_path);
1168 return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_OBJECT_PATH,
1169 &dbus_groupobj_path, error);
1173 dbus_bool_t wpas_dbus_getter_p2p_peergo(DBusMessageIter *iter,
1174 DBusError *error, void *user_data)
1176 struct wpa_supplicant *wpa_s = user_data;
1177 char go_peer_obj_path[WPAS_DBUS_OBJECT_PATH_MAX], *path;
1179 if (wpas_get_p2p_role(wpa_s) != WPAS_P2P_ROLE_CLIENT)
1180 os_snprintf(go_peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX, "/");
1182 os_snprintf(go_peer_obj_path, WPAS_DBUS_OBJECT_PATH_MAX,
1183 "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART "/"
1185 wpa_s->dbus_new_path, MAC2STR(wpa_s->go_dev_addr));
1187 path = go_peer_obj_path;
1188 return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_OBJECT_PATH,
1194 * Peer object properties accessor methods
1197 dbus_bool_t wpas_dbus_getter_p2p_peer_device_name(DBusMessageIter *iter,
1201 struct peer_handler_args *peer_args = user_data;
1202 const struct p2p_peer_info *info;
1205 if (!wpa_dbus_p2p_check_enabled(peer_args->wpa_s, NULL, NULL, error))
1208 /* get the peer info */
1209 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1210 peer_args->p2p_device_addr, 0);
1212 dbus_set_error(error, DBUS_ERROR_FAILED,
1213 "failed to find peer");
1217 tmp = os_strdup(info->device_name);
1219 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1223 if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, &tmp,
1225 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1235 dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
1236 DBusMessageIter *iter, DBusError *error, void *user_data)
1238 struct peer_handler_args *peer_args = user_data;
1239 const struct p2p_peer_info *info;
1241 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1242 peer_args->p2p_device_addr, 0);
1244 dbus_set_error(error, DBUS_ERROR_FAILED,
1245 "failed to find peer");
1249 if (!wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
1252 WPS_DEV_TYPE_LEN, error)) {
1253 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1261 dbus_bool_t wpas_dbus_getter_p2p_peer_config_method(DBusMessageIter *iter,
1265 struct peer_handler_args *peer_args = user_data;
1266 const struct p2p_peer_info *info;
1268 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1269 peer_args->p2p_device_addr, 0);
1271 dbus_set_error(error, DBUS_ERROR_FAILED,
1272 "failed to find peer");
1276 if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT16,
1277 &info->config_methods, error)) {
1278 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1286 dbus_bool_t wpas_dbus_getter_p2p_peer_level(DBusMessageIter *iter,
1290 struct peer_handler_args *peer_args = user_data;
1291 const struct p2p_peer_info *info;
1293 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1294 peer_args->p2p_device_addr, 0);
1296 dbus_set_error(error, DBUS_ERROR_FAILED,
1297 "failed to find peer");
1301 if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_INT32,
1302 &info->level, error)) {
1303 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1311 dbus_bool_t wpas_dbus_getter_p2p_peer_device_capability(DBusMessageIter *iter,
1315 struct peer_handler_args *peer_args = user_data;
1316 const struct p2p_peer_info *info;
1318 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1319 peer_args->p2p_device_addr, 0);
1321 dbus_set_error(error, DBUS_ERROR_FAILED,
1322 "failed to find peer");
1326 if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BYTE,
1327 &info->dev_capab, error)) {
1328 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1336 dbus_bool_t wpas_dbus_getter_p2p_peer_group_capability(DBusMessageIter *iter,
1340 struct peer_handler_args *peer_args = user_data;
1341 const struct p2p_peer_info *info;
1343 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1344 peer_args->p2p_device_addr, 0);
1346 dbus_set_error(error, DBUS_ERROR_FAILED,
1347 "failed to find peer");
1351 if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_BYTE,
1352 &info->group_capab, error)) {
1353 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1361 dbus_bool_t wpas_dbus_getter_p2p_peer_secondary_device_types(
1362 DBusMessageIter *iter, DBusError *error, void *user_data)
1364 struct peer_handler_args *peer_args = user_data;
1365 const struct p2p_peer_info *info;
1366 DBusMessageIter variant_iter, array_iter;
1368 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1369 peer_args->p2p_device_addr, 0);
1371 dbus_set_error(error, DBUS_ERROR_FAILED,
1372 "failed to find peer");
1376 if (!dbus_message_iter_open_container(iter, DBUS_TYPE_VARIANT,
1377 DBUS_TYPE_ARRAY_AS_STRING
1378 DBUS_TYPE_ARRAY_AS_STRING
1379 DBUS_TYPE_BYTE_AS_STRING,
1381 dbus_set_error(error, DBUS_ERROR_FAILED,
1382 "%s: failed to construct message 1", __func__);
1386 if (!dbus_message_iter_open_container(&variant_iter, DBUS_TYPE_ARRAY,
1387 DBUS_TYPE_ARRAY_AS_STRING
1388 DBUS_TYPE_BYTE_AS_STRING,
1390 dbus_set_error(error, DBUS_ERROR_FAILED,
1391 "%s: failed to construct message 2", __func__);
1395 if (info->wps_sec_dev_type_list_len) {
1396 const u8 *sec_dev_type_list = info->wps_sec_dev_type_list;
1397 int num_sec_device_types =
1398 info->wps_sec_dev_type_list_len / WPS_DEV_TYPE_LEN;
1400 DBusMessageIter inner_array_iter;
1402 for (i = 0; i < num_sec_device_types; i++) {
1403 if (!dbus_message_iter_open_container(
1404 &array_iter, DBUS_TYPE_ARRAY,
1405 DBUS_TYPE_BYTE_AS_STRING,
1406 &inner_array_iter)) {
1407 dbus_set_error(error, DBUS_ERROR_FAILED,
1408 "%s: failed to construct "
1414 if (!dbus_message_iter_append_fixed_array(
1415 &inner_array_iter, DBUS_TYPE_BYTE,
1416 &sec_dev_type_list, WPS_DEV_TYPE_LEN)) {
1417 dbus_set_error(error, DBUS_ERROR_FAILED,
1418 "%s: failed to construct "
1424 if (!dbus_message_iter_close_container(
1425 &array_iter, &inner_array_iter)) {
1426 dbus_set_error(error, DBUS_ERROR_FAILED,
1427 "%s: failed to construct "
1433 sec_dev_type_list += WPS_DEV_TYPE_LEN;
1437 if (!dbus_message_iter_close_container(&variant_iter, &array_iter)) {
1438 dbus_set_error(error, DBUS_ERROR_FAILED,
1439 "%s: failed to construct message 6", __func__);
1443 if (!dbus_message_iter_close_container(iter, &variant_iter)) {
1444 dbus_set_error(error, DBUS_ERROR_FAILED,
1445 "%s: failed to construct message 7", __func__);
1453 dbus_bool_t wpas_dbus_getter_p2p_peer_vendor_extension(DBusMessageIter *iter,
1457 struct wpabuf *vendor_extension[P2P_MAX_WPS_VENDOR_EXT];
1458 unsigned int i, num = 0;
1459 struct peer_handler_args *peer_args = user_data;
1460 const struct p2p_peer_info *info;
1462 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1463 peer_args->p2p_device_addr, 0);
1465 dbus_set_error(error, DBUS_ERROR_FAILED,
1466 "failed to find peer");
1470 /* Add WPS vendor extensions attribute */
1471 os_memset(vendor_extension, 0, sizeof(vendor_extension));
1472 for (i = 0; i < P2P_MAX_WPS_VENDOR_EXT; i++) {
1473 if (info->wps_vendor_ext[i] == NULL)
1475 vendor_extension[num] = info->wps_vendor_ext[i];
1479 if (!wpas_dbus_simple_array_array_property_getter(iter, DBUS_TYPE_BYTE,
1488 dbus_bool_t wpas_dbus_getter_p2p_peer_ies(DBusMessageIter *iter,
1489 DBusError *error, void *user_data)
1491 struct peer_handler_args *peer_args = user_data;
1492 const struct p2p_peer_info *info;
1494 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1495 peer_args->p2p_device_addr, 0);
1497 dbus_set_error(error, DBUS_ERROR_FAILED,
1498 "failed to find peer");
1502 if (info->wfd_subelems == NULL)
1503 return wpas_dbus_simple_array_property_getter(iter,
1507 return wpas_dbus_simple_array_property_getter(
1508 iter, DBUS_TYPE_BYTE, (char *) info->wfd_subelems->buf,
1509 info->wfd_subelems->used, error);
1513 dbus_bool_t wpas_dbus_getter_p2p_peer_device_address(DBusMessageIter *iter,
1517 struct peer_handler_args *peer_args = user_data;
1518 const struct p2p_peer_info *info;
1520 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1521 peer_args->p2p_device_addr, 0);
1523 dbus_set_error(error, DBUS_ERROR_FAILED,
1524 "failed to find peer");
1528 return wpas_dbus_simple_array_property_getter(
1529 iter, DBUS_TYPE_BYTE, (char *) info->p2p_device_addr,
1534 struct peer_group_data {
1535 struct wpa_supplicant *wpa_s;
1536 const struct p2p_peer_info *info;
1538 unsigned int nb_paths;
1543 static int match_group_where_peer_is_client(struct p2p_group *group,
1546 struct peer_group_data *data = user_data;
1547 const struct p2p_group_config *cfg;
1548 struct wpa_supplicant *wpa_s_go;
1551 if (!p2p_group_is_client_connected(group, data->info->p2p_device_addr))
1554 cfg = p2p_group_get_config(group);
1556 wpa_s_go = wpas_get_p2p_go_iface(data->wpa_s, cfg->ssid,
1558 if (wpa_s_go == NULL)
1561 paths = os_realloc_array(data->paths, data->nb_paths + 1,
1566 data->paths = paths;
1567 data->paths[data->nb_paths] = wpa_s_go->dbus_groupobj_path;
1573 data->error = ENOMEM;
1578 dbus_bool_t wpas_dbus_getter_p2p_peer_groups(DBusMessageIter *iter,
1582 struct peer_handler_args *peer_args = user_data;
1583 const struct p2p_peer_info *info;
1584 struct peer_group_data data;
1585 struct wpa_supplicant *wpa_s_go;
1586 dbus_bool_t success = FALSE;
1588 info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
1589 peer_args->p2p_device_addr, 0);
1591 dbus_set_error(error, DBUS_ERROR_FAILED,
1592 "failed to find peer");
1596 os_memset(&data, 0, sizeof(data));
1597 wpa_s_go = wpas_get_p2p_client_iface(peer_args->wpa_s,
1598 info->p2p_device_addr);
1600 data.paths = os_calloc(1, sizeof(char *));
1601 if (data.paths == NULL)
1603 data.paths[0] = wpa_s_go->dbus_groupobj_path;
1607 data.wpa_s = peer_args->wpa_s;
1610 p2p_loop_on_all_groups(peer_args->wpa_s->global->p2p,
1611 match_group_where_peer_is_client, &data);
1615 if (data.paths == NULL) {
1616 return wpas_dbus_simple_array_property_getter(
1617 iter, DBUS_TYPE_OBJECT_PATH, NULL, 0, error);
1620 success = wpas_dbus_simple_array_property_getter(iter,
1621 DBUS_TYPE_OBJECT_PATH,
1623 data.nb_paths, error);
1627 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1629 os_free(data.paths);
1635 * wpas_dbus_getter_persistent_groups - Get array of persistent group objects
1636 * @iter: Pointer to incoming dbus message iter
1637 * @error: Location to store error on failure
1638 * @user_data: Function specific data
1639 * Returns: TRUE on success, FALSE on failure
1641 * Getter for "PersistentGroups" property.
1643 dbus_bool_t wpas_dbus_getter_persistent_groups(DBusMessageIter *iter,
1647 struct wpa_supplicant *wpa_s = user_data;
1648 struct wpa_ssid *ssid;
1650 unsigned int i = 0, num = 0;
1651 dbus_bool_t success = FALSE;
1653 if (wpa_s->conf == NULL) {
1654 wpa_printf(MSG_ERROR, "dbus: %s: "
1655 "An error occurred getting persistent groups list",
1657 dbus_set_error_const(error, DBUS_ERROR_FAILED, "an error "
1658 "occurred getting persistent groups list");
1662 for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next)
1663 if (network_is_persistent_group(ssid))
1666 paths = os_calloc(num, sizeof(char *));
1668 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
1672 /* Loop through configured networks and append object path of each */
1673 for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) {
1674 if (!network_is_persistent_group(ssid))
1676 paths[i] = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
1677 if (paths[i] == NULL) {
1678 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY,
1682 /* Construct the object path for this network. */
1683 os_snprintf(paths[i++], WPAS_DBUS_OBJECT_PATH_MAX,
1684 "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%d",
1685 wpa_s->dbus_new_path, ssid->id);
1688 success = wpas_dbus_simple_array_property_getter(iter,
1689 DBUS_TYPE_OBJECT_PATH,
1694 os_free(paths[--i]);
1701 * wpas_dbus_getter_persistent_group_properties - Get options for a persistent
1703 * @iter: Pointer to incoming dbus message iter
1704 * @error: Location to store error on failure
1705 * @user_data: Function specific data
1706 * Returns: TRUE on success, FALSE on failure
1708 * Getter for "Properties" property of a persistent group.
1710 dbus_bool_t wpas_dbus_getter_persistent_group_properties(DBusMessageIter *iter,
1714 struct network_handler_args *net = user_data;
1716 /* Leveraging the fact that persistent group object is still
1717 * represented in same manner as network within.
1719 return wpas_dbus_getter_network_properties(iter, error, net);
1724 * wpas_dbus_setter_persistent_group_properties - Get options for a persistent
1726 * @iter: Pointer to incoming dbus message iter
1727 * @error: Location to store error on failure
1728 * @user_data: Function specific data
1729 * Returns: TRUE on success, FALSE on failure
1731 * Setter for "Properties" property of a persistent group.
1733 dbus_bool_t wpas_dbus_setter_persistent_group_properties(DBusMessageIter *iter,
1737 struct network_handler_args *net = user_data;
1738 struct wpa_ssid *ssid = net->ssid;
1739 DBusMessageIter variant_iter;
1742 * Leveraging the fact that persistent group object is still
1743 * represented in same manner as network within.
1745 dbus_message_iter_recurse(iter, &variant_iter);
1746 return set_network_properties(net->wpa_s, ssid, &variant_iter, error);
1751 * wpas_dbus_new_iface_add_persistent_group - Add a new configured
1753 * @message: Pointer to incoming dbus message
1754 * @wpa_s: wpa_supplicant structure for a network interface
1755 * Returns: A dbus message containing the object path of the new
1758 * Handler function for "AddPersistentGroup" method call of a P2P Device
1761 DBusMessage * wpas_dbus_handler_add_persistent_group(
1762 DBusMessage *message, struct wpa_supplicant *wpa_s)
1764 DBusMessage *reply = NULL;
1765 DBusMessageIter iter;
1766 struct wpa_ssid *ssid = NULL;
1767 char path_buf[WPAS_DBUS_OBJECT_PATH_MAX], *path = path_buf;
1770 dbus_message_iter_init(message, &iter);
1772 ssid = wpa_config_add_network(wpa_s->conf);
1774 wpa_printf(MSG_ERROR, "dbus: %s: "
1775 "Cannot add new persistent group", __func__);
1776 reply = wpas_dbus_error_unknown_error(
1778 "wpa_supplicant could not add "
1779 "a persistent group on this interface.");
1783 /* Mark the ssid as being a persistent group before the notification */
1785 ssid->p2p_persistent_group = 1;
1786 wpas_notify_persistent_group_added(wpa_s, ssid);
1788 wpa_config_set_network_defaults(ssid);
1790 dbus_error_init(&error);
1791 if (!set_network_properties(wpa_s, ssid, &iter, &error)) {
1792 wpa_printf(MSG_DEBUG, "dbus: %s: "
1793 "Control interface could not set persistent group "
1794 "properties", __func__);
1795 reply = wpas_dbus_reply_new_from_error(message, &error,
1796 DBUS_ERROR_INVALID_ARGS,
1797 "Failed to set network "
1799 dbus_error_free(&error);
1803 /* Construct the object path for this network. */
1804 os_snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,
1805 "%s/" WPAS_DBUS_NEW_PERSISTENT_GROUPS_PART "/%d",
1806 wpa_s->dbus_new_path, ssid->id);
1808 reply = dbus_message_new_method_return(message);
1809 if (reply == NULL) {
1810 reply = dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
1814 if (!dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH, &path,
1815 DBUS_TYPE_INVALID)) {
1816 dbus_message_unref(reply);
1817 reply = dbus_message_new_error(message, DBUS_ERROR_NO_MEMORY,
1826 wpas_notify_persistent_group_removed(wpa_s, ssid);
1827 wpa_config_remove_network(wpa_s->conf, ssid->id);
1834 * wpas_dbus_handler_remove_persistent_group - Remove a configured persistent
1836 * @message: Pointer to incoming dbus message
1837 * @wpa_s: wpa_supplicant structure for a network interface
1838 * Returns: NULL on success or dbus error on failure
1840 * Handler function for "RemovePersistentGroup" method call of a P2P Device
1843 DBusMessage * wpas_dbus_handler_remove_persistent_group(
1844 DBusMessage *message, struct wpa_supplicant *wpa_s)
1846 DBusMessage *reply = NULL;
1848 char *iface = NULL, *persistent_group_id = NULL;
1850 struct wpa_ssid *ssid;
1852 dbus_message_get_args(message, NULL, DBUS_TYPE_OBJECT_PATH, &op,
1856 * Extract the network ID and ensure the network is actually a child of
1859 iface = wpas_dbus_new_decompose_object_path(op, 1,
1860 &persistent_group_id,
1862 if (iface == NULL || os_strcmp(iface, wpa_s->dbus_new_path) != 0) {
1863 reply = wpas_dbus_error_invalid_args(message, op);
1867 id = strtoul(persistent_group_id, NULL, 10);
1868 if (errno == EINVAL) {
1869 reply = wpas_dbus_error_invalid_args(message, op);
1873 ssid = wpa_config_get_network(wpa_s->conf, id);
1875 reply = wpas_dbus_error_persistent_group_unknown(message);
1879 wpas_notify_persistent_group_removed(wpa_s, ssid);
1881 if (wpa_config_remove_network(wpa_s->conf, id) < 0) {
1882 wpa_printf(MSG_ERROR, "dbus: %s: "
1883 "error occurred when removing persistent group %d",
1885 reply = wpas_dbus_error_unknown_error(
1887 "error removing the specified persistent group on "
1894 os_free(persistent_group_id);
1899 static void remove_persistent_group(struct wpa_supplicant *wpa_s,
1900 struct wpa_ssid *ssid)
1902 wpas_notify_persistent_group_removed(wpa_s, ssid);
1904 if (wpa_config_remove_network(wpa_s->conf, ssid->id) < 0) {
1905 wpa_printf(MSG_ERROR, "dbus: %s: "
1906 "error occurred when removing persistent group %d",
1907 __func__, ssid->id);
1914 * wpas_dbus_handler_remove_all_persistent_groups - Remove all configured
1916 * @message: Pointer to incoming dbus message
1917 * @wpa_s: wpa_supplicant structure for a network interface
1918 * Returns: NULL on success or dbus error on failure
1920 * Handler function for "RemoveAllPersistentGroups" method call of a
1921 * P2P Device interface.
1923 DBusMessage * wpas_dbus_handler_remove_all_persistent_groups(
1924 DBusMessage *message, struct wpa_supplicant *wpa_s)
1926 struct wpa_ssid *ssid, *next;
1927 struct wpa_config *config;
1929 config = wpa_s->conf;
1930 ssid = config->ssid;
1933 if (network_is_persistent_group(ssid))
1934 remove_persistent_group(wpa_s, ssid);
1942 * Group object properties accessor methods
1945 dbus_bool_t wpas_dbus_getter_p2p_group_members(DBusMessageIter *iter,
1949 struct wpa_supplicant *wpa_s = user_data;
1950 struct wpa_ssid *ssid;
1951 unsigned int num_members;
1956 dbus_bool_t success = FALSE;
1958 /* Verify correct role for this property */
1959 if (wpas_get_p2p_role(wpa_s) != WPAS_P2P_ROLE_GO) {
1960 return wpas_dbus_simple_array_property_getter(
1961 iter, DBUS_TYPE_OBJECT_PATH, NULL, 0, error);
1964 ssid = wpa_s->conf->ssid;
1965 /* At present WPAS P2P_GO mode only applicable for p2p_go */
1966 if (ssid->mode != WPAS_MODE_P2P_GO &&
1967 ssid->mode != WPAS_MODE_AP &&
1968 ssid->mode != WPAS_MODE_P2P_GROUP_FORMATION)
1971 num_members = p2p_get_group_num_members(wpa_s->p2p_group);
1973 paths = os_calloc(num_members, sizeof(char *));
1978 while ((addr = p2p_iterate_group_members(wpa_s->p2p_group, &next))) {
1979 paths[i] = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);
1982 os_snprintf(paths[i], WPAS_DBUS_OBJECT_PATH_MAX,
1983 "%s/" WPAS_DBUS_NEW_P2P_PEERS_PART
1985 wpa_s->parent->dbus_new_path, MAC2STR(addr));
1989 success = wpas_dbus_simple_array_property_getter(iter,
1990 DBUS_TYPE_OBJECT_PATH,
1994 for (i = 0; i < num_members; i++)
2000 dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
2002 for (i = 0; i < num_members; i++)
2010 dbus_bool_t wpas_dbus_getter_p2p_group_ssid(DBusMessageIter *iter,
2011 DBusError *error, void *user_data)
2013 struct wpa_supplicant *wpa_s = user_data;
2014 if (wpa_s->current_ssid == NULL)
2016 return wpas_dbus_simple_array_property_getter(
2017 iter, DBUS_TYPE_BYTE, wpa_s->current_ssid->ssid,
2018 wpa_s->current_ssid->ssid_len, error);
2022 dbus_bool_t wpas_dbus_getter_p2p_group_bssid(DBusMessageIter *iter,
2026 struct wpa_supplicant *wpa_s = user_data;
2027 u8 role = wpas_get_p2p_role(wpa_s);
2030 if (role == WPAS_P2P_ROLE_CLIENT) {
2031 if (wpa_s->current_ssid == NULL)
2033 p_bssid = wpa_s->current_ssid->bssid;
2035 if (wpa_s->ap_iface == NULL)
2037 p_bssid = wpa_s->ap_iface->bss[0]->own_addr;
2040 return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
2046 dbus_bool_t wpas_dbus_getter_p2p_group_frequency(DBusMessageIter *iter,
2050 struct wpa_supplicant *wpa_s = user_data;
2052 u8 role = wpas_get_p2p_role(wpa_s);
2054 if (role == WPAS_P2P_ROLE_CLIENT) {
2055 if (wpa_s->go_params == NULL)
2057 op_freq = wpa_s->go_params->freq;
2059 if (wpa_s->ap_iface == NULL)
2061 op_freq = wpa_s->ap_iface->freq;
2064 return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_UINT16,
2069 dbus_bool_t wpas_dbus_getter_p2p_group_passphrase(DBusMessageIter *iter,
2073 struct wpa_supplicant *wpa_s = user_data;
2074 u8 role = wpas_get_p2p_role(wpa_s);
2075 char *p_pass = NULL;
2077 /* Verify correct role for this property */
2078 if (role == WPAS_P2P_ROLE_GO) {
2079 if (wpa_s->current_ssid == NULL)
2081 p_pass = wpa_s->current_ssid->passphrase;
2085 return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING,
2091 dbus_bool_t wpas_dbus_getter_p2p_group_psk(DBusMessageIter *iter,
2092 DBusError *error, void *user_data)
2094 struct wpa_supplicant *wpa_s = user_data;
2095 u8 role = wpas_get_p2p_role(wpa_s);
2099 /* Verify correct role for this property */
2100 if (role == WPAS_P2P_ROLE_CLIENT) {
2101 if (wpa_s->current_ssid == NULL)
2103 p_psk = wpa_s->current_ssid->psk;
2107 return wpas_dbus_simple_array_property_getter(iter, DBUS_TYPE_BYTE,
2108 &p_psk, psk_len, error);
2112 dbus_bool_t wpas_dbus_getter_p2p_group_vendor_ext(DBusMessageIter *iter,
2116 struct wpa_supplicant *wpa_s = user_data;
2117 struct hostapd_data *hapd;
2118 struct wpabuf *vendor_ext[MAX_WPS_VENDOR_EXTENSIONS];
2119 unsigned int i, num_vendor_ext = 0;
2121 os_memset(vendor_ext, 0, sizeof(vendor_ext));
2123 /* Verify correct role for this property */
2124 if (wpas_get_p2p_role(wpa_s) == WPAS_P2P_ROLE_GO) {
2125 if (wpa_s->ap_iface == NULL)
2127 hapd = wpa_s->ap_iface->bss[0];
2129 /* Parse WPS Vendor Extensions sent in Beacon/Probe Response */
2130 for (i = 0; i < MAX_WPS_VENDOR_EXTENSIONS; i++) {
2131 if (hapd->conf->wps_vendor_ext[i] == NULL)
2133 vendor_ext[num_vendor_ext++] =
2134 hapd->conf->wps_vendor_ext[i];
2138 /* Return vendor extensions or no data */
2139 return wpas_dbus_simple_array_array_property_getter(iter,
2147 dbus_bool_t wpas_dbus_setter_p2p_group_vendor_ext(DBusMessageIter *iter,
2151 struct wpa_supplicant *wpa_s = user_data;
2152 DBusMessageIter variant_iter, iter_dict;
2153 struct wpa_dbus_dict_entry entry = { .type = DBUS_TYPE_STRING };
2155 struct hostapd_data *hapd = NULL;
2157 if (wpas_get_p2p_role(wpa_s) == WPAS_P2P_ROLE_GO &&
2158 wpa_s->ap_iface != NULL)
2159 hapd = wpa_s->ap_iface->bss[0];
2163 dbus_message_iter_recurse(iter, &variant_iter);
2164 if (!wpa_dbus_dict_open_read(&variant_iter, &iter_dict, error))
2167 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2168 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry)) {
2169 dbus_set_error_const(error, DBUS_ERROR_INVALID_ARGS,
2170 "invalid message format");
2174 if (os_strcmp(entry.key, "WPSVendorExtensions") == 0) {
2175 if (entry.type != DBUS_TYPE_ARRAY ||
2176 entry.array_type != WPAS_DBUS_TYPE_BINARRAY ||
2177 entry.array_len > MAX_WPS_VENDOR_EXTENSIONS)
2180 for (i = 0; i < MAX_WPS_VENDOR_EXTENSIONS; i++) {
2181 if (i < entry.array_len) {
2182 hapd->conf->wps_vendor_ext[i] =
2183 entry.binarray_value[i];
2184 entry.binarray_value[i] = NULL;
2186 hapd->conf->wps_vendor_ext[i] = NULL;
2189 hostapd_update_wps(hapd);
2193 wpa_dbus_dict_entry_clear(&entry);
2199 wpa_dbus_dict_entry_clear(&entry);
2200 dbus_set_error_const(error, DBUS_ERROR_INVALID_ARGS,
2201 "invalid message format");
2206 DBusMessage * wpas_dbus_handler_p2p_add_service(DBusMessage *message,
2207 struct wpa_supplicant *wpa_s)
2209 DBusMessageIter iter_dict;
2210 DBusMessage *reply = NULL;
2211 DBusMessageIter iter;
2212 struct wpa_dbus_dict_entry entry;
2215 char *service = NULL;
2216 struct wpabuf *query = NULL;
2217 struct wpabuf *resp = NULL;
2220 dbus_message_iter_init(message, &iter);
2222 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
2225 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2226 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2229 if (!os_strcmp(entry.key, "service_type") &&
2230 (entry.type == DBUS_TYPE_STRING)) {
2231 if (!os_strcmp(entry.str_value, "upnp"))
2233 else if (!os_strcmp(entry.str_value, "bonjour"))
2237 } else if (!os_strcmp(entry.key, "version") &&
2238 entry.type == DBUS_TYPE_INT32) {
2239 version = entry.uint32_value;
2240 } else if (!os_strcmp(entry.key, "service") &&
2241 (entry.type == DBUS_TYPE_STRING)) {
2242 service = os_strdup(entry.str_value);
2243 } else if (!os_strcmp(entry.key, "query")) {
2244 if ((entry.type != DBUS_TYPE_ARRAY) ||
2245 (entry.array_type != DBUS_TYPE_BYTE))
2247 query = wpabuf_alloc_copy(
2248 entry.bytearray_value,
2250 } else if (!os_strcmp(entry.key, "response")) {
2251 if ((entry.type != DBUS_TYPE_ARRAY) ||
2252 (entry.array_type != DBUS_TYPE_BYTE))
2254 resp = wpabuf_alloc_copy(entry.bytearray_value,
2257 wpa_dbus_dict_entry_clear(&entry);
2261 if (version <= 0 || service == NULL)
2264 if (wpas_p2p_service_add_upnp(wpa_s, version, service) != 0)
2269 } else if (bonjour == 1) {
2270 if (query == NULL || resp == NULL)
2273 if (wpas_p2p_service_add_bonjour(wpa_s, query, resp) < 0)
2282 wpa_dbus_dict_entry_clear(&entry);
2287 return wpas_dbus_error_invalid_args(message, NULL);
2291 DBusMessage * wpas_dbus_handler_p2p_delete_service(
2292 DBusMessage *message, struct wpa_supplicant *wpa_s)
2294 DBusMessageIter iter_dict;
2295 DBusMessage *reply = NULL;
2296 DBusMessageIter iter;
2297 struct wpa_dbus_dict_entry entry;
2301 char *service = NULL;
2302 struct wpabuf *query = NULL;
2305 dbus_message_iter_init(message, &iter);
2307 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
2310 if (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2311 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2314 if (!os_strcmp(entry.key, "service_type") &&
2315 (entry.type == DBUS_TYPE_STRING)) {
2316 if (!os_strcmp(entry.str_value, "upnp"))
2318 else if (!os_strcmp(entry.str_value, "bonjour"))
2322 wpa_dbus_dict_entry_clear(&entry);
2326 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2327 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2329 if (!os_strcmp(entry.key, "version") &&
2330 entry.type == DBUS_TYPE_INT32)
2331 version = entry.uint32_value;
2332 else if (!os_strcmp(entry.key, "service") &&
2333 entry.type == DBUS_TYPE_STRING)
2334 service = os_strdup(entry.str_value);
2338 wpa_dbus_dict_entry_clear(&entry);
2341 if (version <= 0 || service == NULL)
2344 ret = wpas_p2p_service_del_upnp(wpa_s, version, service);
2348 } else if (bonjour == 1) {
2349 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2350 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2353 if (!os_strcmp(entry.key, "query")) {
2354 if ((entry.type != DBUS_TYPE_ARRAY) ||
2355 (entry.array_type != DBUS_TYPE_BYTE))
2357 query = wpabuf_alloc_copy(
2358 entry.bytearray_value,
2363 wpa_dbus_dict_entry_clear(&entry);
2369 ret = wpas_p2p_service_del_bonjour(wpa_s, query);
2378 wpa_dbus_dict_entry_clear(&entry);
2380 return wpas_dbus_error_invalid_args(message, NULL);
2384 DBusMessage * wpas_dbus_handler_p2p_flush_service(DBusMessage *message,
2385 struct wpa_supplicant *wpa_s)
2387 wpas_p2p_service_flush(wpa_s);
2392 DBusMessage * wpas_dbus_handler_p2p_service_sd_req(
2393 DBusMessage *message, struct wpa_supplicant *wpa_s)
2395 DBusMessageIter iter_dict;
2396 DBusMessage *reply = NULL;
2397 DBusMessageIter iter;
2398 struct wpa_dbus_dict_entry entry;
2400 char *service = NULL;
2401 char *peer_object_path = NULL;
2402 struct wpabuf *tlv = NULL;
2405 u8 addr_buf[ETH_ALEN], *addr;
2407 dbus_message_iter_init(message, &iter);
2409 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
2412 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2413 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2415 if (!os_strcmp(entry.key, "peer_object") &&
2416 entry.type == DBUS_TYPE_OBJECT_PATH) {
2417 peer_object_path = os_strdup(entry.str_value);
2418 } else if (!os_strcmp(entry.key, "service_type") &&
2419 entry.type == DBUS_TYPE_STRING) {
2420 if (!os_strcmp(entry.str_value, "upnp"))
2424 } else if (!os_strcmp(entry.key, "version") &&
2425 entry.type == DBUS_TYPE_INT32) {
2426 version = entry.uint32_value;
2427 } else if (!os_strcmp(entry.key, "service") &&
2428 entry.type == DBUS_TYPE_STRING) {
2429 service = os_strdup(entry.str_value);
2430 } else if (!os_strcmp(entry.key, "tlv")) {
2431 if (entry.type != DBUS_TYPE_ARRAY ||
2432 entry.array_type != DBUS_TYPE_BYTE)
2434 tlv = wpabuf_alloc_copy(entry.bytearray_value,
2439 wpa_dbus_dict_entry_clear(&entry);
2442 if (!peer_object_path) {
2445 if (parse_peer_object_path(peer_object_path, addr_buf) < 0 ||
2446 !p2p_peer_known(wpa_s->global->p2p, addr_buf))
2453 if (version <= 0 || service == NULL)
2456 ref = wpas_p2p_sd_request_upnp(wpa_s, addr, version, service);
2460 ref = wpas_p2p_sd_request(wpa_s, addr, tlv);
2465 reply = dbus_message_new_method_return(message);
2466 dbus_message_append_args(reply, DBUS_TYPE_UINT64,
2467 &ref, DBUS_TYPE_INVALID);
2469 reply = wpas_dbus_error_unknown_error(
2470 message, "Unable to send SD request");
2474 os_free(peer_object_path);
2477 wpa_dbus_dict_entry_clear(&entry);
2481 reply = wpas_dbus_error_invalid_args(message, NULL);
2486 DBusMessage * wpas_dbus_handler_p2p_service_sd_res(
2487 DBusMessage *message, struct wpa_supplicant *wpa_s)
2489 DBusMessageIter iter_dict;
2490 DBusMessage *reply = NULL;
2491 DBusMessageIter iter;
2492 struct wpa_dbus_dict_entry entry;
2493 char *peer_object_path = NULL;
2494 struct wpabuf *tlv = NULL;
2499 dbus_message_iter_init(message, &iter);
2501 if (!wpa_dbus_dict_open_read(&iter, &iter_dict, NULL))
2504 while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {
2505 if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))
2508 if (!os_strcmp(entry.key, "peer_object") &&
2509 entry.type == DBUS_TYPE_OBJECT_PATH) {
2510 peer_object_path = os_strdup(entry.str_value);
2511 } else if (!os_strcmp(entry.key, "frequency") &&
2512 entry.type == DBUS_TYPE_INT32) {
2513 freq = entry.uint32_value;
2514 } else if (!os_strcmp(entry.key, "dialog_token") &&
2515 entry.type == DBUS_TYPE_UINT32) {
2516 dlg_tok = entry.uint32_value;
2517 } else if (!os_strcmp(entry.key, "tlvs")) {
2518 if (entry.type != DBUS_TYPE_ARRAY ||
2519 entry.array_type != DBUS_TYPE_BYTE)
2521 tlv = wpabuf_alloc_copy(entry.bytearray_value,
2526 wpa_dbus_dict_entry_clear(&entry);
2528 if (!peer_object_path ||
2529 (parse_peer_object_path(peer_object_path, addr) < 0) ||
2530 !p2p_peer_known(wpa_s->global->p2p, addr))
2536 wpas_p2p_sd_response(wpa_s, freq, addr, (u8) dlg_tok, tlv);
2539 os_free(peer_object_path);
2542 wpa_dbus_dict_entry_clear(&entry);
2544 reply = wpas_dbus_error_invalid_args(message, NULL);
2549 DBusMessage * wpas_dbus_handler_p2p_service_sd_cancel_req(
2550 DBusMessage *message, struct wpa_supplicant *wpa_s)
2552 DBusMessageIter iter;
2555 dbus_message_iter_init(message, &iter);
2556 dbus_message_iter_get_basic(&iter, &req);
2561 if (wpas_p2p_sd_cancel_request(wpa_s, req) < 0)
2566 return wpas_dbus_error_invalid_args(message, NULL);
2570 DBusMessage * wpas_dbus_handler_p2p_service_update(
2571 DBusMessage *message, struct wpa_supplicant *wpa_s)
2573 wpas_p2p_sd_service_update(wpa_s);
2578 DBusMessage * wpas_dbus_handler_p2p_serv_disc_external(
2579 DBusMessage *message, struct wpa_supplicant *wpa_s)
2581 DBusMessageIter iter;
2584 dbus_message_iter_init(message, &iter);
2585 dbus_message_iter_get_basic(&iter, &ext);
2587 wpa_s->p2p_sd_over_ctrl_iface = ext;