Import moonshot-gss-eap_0.9.2.orig.tar.gz
[mech_eap.git] / libeap / wpa_supplicant / p2p_supplicant.c
diff --git a/libeap/wpa_supplicant/p2p_supplicant.c b/libeap/wpa_supplicant/p2p_supplicant.c
deleted file mode 100644 (file)
index f57e50c..0000000
+++ /dev/null
@@ -1,3619 +0,0 @@
-/*
- * wpa_supplicant - P2P
- * Copyright (c) 2009-2010, Atheros Communications
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
- */
-
-#include "includes.h"
-
-#include "common.h"
-#include "eloop.h"
-#include "common/ieee802_11_common.h"
-#include "common/ieee802_11_defs.h"
-#include "common/wpa_ctrl.h"
-#include "wps/wps_i.h"
-#include "p2p/p2p.h"
-#include "ap/hostapd.h"
-#include "ap/p2p_hostapd.h"
-#include "wpa_supplicant_i.h"
-#include "driver_i.h"
-#include "ap.h"
-#include "config_ssid.h"
-#include "config.h"
-#include "mlme.h"
-#include "notify.h"
-#include "scan.h"
-#include "bss.h"
-#include "wps_supplicant.h"
-#include "p2p_supplicant.h"
-
-
-static void wpas_p2p_long_listen_timeout(void *eloop_ctx, void *timeout_ctx);
-static struct wpa_supplicant *
-wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
-                        int go);
-static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s);
-static void wpas_p2p_join_scan(void *eloop_ctx, void *timeout_ctx);
-static int wpas_p2p_join(struct wpa_supplicant *wpa_s, const u8 *iface_addr,
-                        const u8 *dev_addr, enum p2p_wps_method wps_method);
-static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s);
-static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s);
-
-
-static void wpas_p2p_scan_res_handler(struct wpa_supplicant *wpa_s,
-                                     struct wpa_scan_results *scan_res)
-{
-       size_t i;
-
-       if (wpa_s->global->p2p_disabled)
-               return;
-
-       wpa_printf(MSG_DEBUG, "P2P: Scan results received (%d BSS)",
-                  (int) scan_res->num);
-
-       for (i = 0; i < scan_res->num; i++) {
-               struct wpa_scan_res *bss = scan_res->res[i];
-               if (p2p_scan_res_handler(wpa_s->global->p2p, bss->bssid,
-                                        bss->freq, bss->level,
-                                        (const u8 *) (bss + 1),
-                                        bss->ie_len) > 0)
-                       return;
-       }
-
-       p2p_scan_res_handled(wpa_s->global->p2p);
-}
-
-
-static int wpas_p2p_scan(void *ctx, enum p2p_scan_type type, int freq)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       struct wpa_driver_scan_params params;
-       int ret;
-       struct wpabuf *wps_ie, *ies;
-       int social_channels[] = { 2412, 2437, 2462, 0, 0 };
-
-       os_memset(&params, 0, sizeof(params));
-
-       /* P2P Wildcard SSID */
-       params.num_ssids = 1;
-       params.ssids[0].ssid = (u8 *) P2P_WILDCARD_SSID;
-       params.ssids[0].ssid_len = P2P_WILDCARD_SSID_LEN;
-
-       wpa_s->wps->dev.p2p = 1;
-       wps_ie = wps_build_probe_req_ie(0, &wpa_s->wps->dev, wpa_s->wps->uuid,
-                                       WPS_REQ_ENROLLEE);
-       if (wps_ie == NULL)
-               return -1;
-
-       ies = wpabuf_alloc(wpabuf_len(wps_ie) + 100);
-       if (ies == NULL) {
-               wpabuf_free(wps_ie);
-               return -1;
-       }
-       wpabuf_put_buf(ies, wps_ie);
-       wpabuf_free(wps_ie);
-
-       p2p_scan_ie(wpa_s->global->p2p, ies);
-
-       params.extra_ies = wpabuf_head(ies);
-       params.extra_ies_len = wpabuf_len(ies);
-
-       switch (type) {
-       case P2P_SCAN_SOCIAL:
-               params.freqs = social_channels;
-               break;
-       case P2P_SCAN_FULL:
-               break;
-       case P2P_SCAN_SPECIFIC:
-               social_channels[0] = freq;
-               social_channels[1] = 0;
-               params.freqs = social_channels;
-               break;
-       case P2P_SCAN_SOCIAL_PLUS_ONE:
-               social_channels[3] = freq;
-               params.freqs = social_channels;
-               break;
-       }
-
-       wpa_s->scan_res_handler = wpas_p2p_scan_res_handler;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
-               ret = ieee80211_sta_req_scan(wpa_s, &params);
-       else
-               ret = wpa_drv_scan(wpa_s, &params);
-
-       wpabuf_free(ies);
-
-       return ret;
-}
-
-
-#ifdef CONFIG_CLIENT_MLME
-static void p2p_rx_action_mlme(void *ctx, const u8 *buf, size_t len, int freq)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       const struct ieee80211_mgmt *mgmt;
-       size_t hdr_len;
-
-       if (wpa_s->global->p2p_disabled)
-               return;
-       mgmt = (const struct ieee80211_mgmt *) buf;
-       hdr_len = (const u8 *) &mgmt->u.action.u.vs_public_action.action - buf;
-       if (hdr_len > len)
-               return;
-       p2p_rx_action(wpa_s->global->p2p, mgmt->da, mgmt->sa, mgmt->bssid,
-                     mgmt->u.action.category,
-                     &mgmt->u.action.u.vs_public_action.action,
-                     len - hdr_len, freq);
-}
-#endif /* CONFIG_CLIENT_MLME */
-
-
-static enum wpa_driver_if_type wpas_p2p_if_type(int p2p_group_interface)
-{
-       switch (p2p_group_interface) {
-       case P2P_GROUP_INTERFACE_PENDING:
-               return WPA_IF_P2P_GROUP;
-       case P2P_GROUP_INTERFACE_GO:
-               return WPA_IF_P2P_GO;
-       case P2P_GROUP_INTERFACE_CLIENT:
-               return WPA_IF_P2P_CLIENT;
-       }
-
-       return WPA_IF_P2P_GROUP;
-}
-
-
-static void wpas_p2p_group_delete(struct wpa_supplicant *wpa_s)
-{
-       struct wpa_ssid *ssid;
-       char *gtype;
-
-       ssid = wpa_s->current_ssid;
-       if (ssid == NULL) {
-               /*
-                * The current SSID was not known, but there may still be a
-                * pending P2P group interface waiting for provisioning.
-                */
-               ssid = wpa_s->conf->ssid;
-               while (ssid) {
-                       if (ssid->p2p_group &&
-                           (ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION ||
-                            (ssid->key_mgmt & WPA_KEY_MGMT_WPS)))
-                               break;
-                       ssid = ssid->next;
-               }
-       }
-       if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_GO)
-               gtype = "GO";
-       else if (wpa_s->p2p_group_interface == P2P_GROUP_INTERFACE_CLIENT ||
-                (ssid && ssid->mode == WPAS_MODE_INFRA)) {
-               wpa_s->reassociate = 0;
-               wpa_s->disconnected = 1;
-               wpa_supplicant_deauthenticate(wpa_s,
-                                             WLAN_REASON_DEAUTH_LEAVING);
-               gtype = "client";
-       } else
-               gtype = "GO";
-       if (wpa_s->cross_connect_in_use) {
-               wpa_s->cross_connect_in_use = 0;
-               wpa_msg(wpa_s->parent, MSG_INFO,
-                       P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
-                       wpa_s->ifname, wpa_s->cross_connect_uplink);
-       }
-       wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_REMOVED "%s %s",
-               wpa_s->ifname, gtype);
-       if (wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE) {
-               struct wpa_global *global;
-               char *ifname;
-               enum wpa_driver_if_type type;
-               wpa_printf(MSG_DEBUG, "P2P: Remove group interface %s",
-                       wpa_s->ifname);
-               global = wpa_s->global;
-               ifname = os_strdup(wpa_s->ifname);
-               type = wpas_p2p_if_type(wpa_s->p2p_group_interface);
-               wpa_supplicant_remove_iface(wpa_s->global, wpa_s);
-               wpa_s = global->ifaces;
-               if (wpa_s && ifname)
-                       wpa_drv_if_remove(wpa_s, type, ifname);
-               os_free(ifname);
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "P2P: Remove temporary group network");
-       if (ssid && (ssid->p2p_group ||
-                    ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION ||
-                    (ssid->key_mgmt & WPA_KEY_MGMT_WPS))) {
-               int id = ssid->id;
-               if (ssid == wpa_s->current_ssid)
-                       wpa_s->current_ssid = NULL;
-               wpas_notify_network_removed(wpa_s, ssid);
-               wpa_config_remove_network(wpa_s->conf, id);
-               wpa_supplicant_clear_status(wpa_s);
-       } else {
-               wpa_printf(MSG_DEBUG, "P2P: Temporary group network not "
-                          "found");
-       }
-       wpa_supplicant_ap_deinit(wpa_s);
-}
-
-
-static int wpas_p2p_persistent_group(struct wpa_supplicant *wpa_s,
-                                    u8 *go_dev_addr,
-                                    const u8 *ssid, size_t ssid_len)
-{
-       struct wpa_bss *bss;
-       const u8 *bssid;
-       struct wpabuf *p2p;
-       u8 group_capab;
-       const u8 *addr;
-
-       if (wpa_s->go_params)
-               bssid = wpa_s->go_params->peer_interface_addr;
-       else
-               bssid = wpa_s->bssid;
-
-       bss = wpa_bss_get(wpa_s, bssid, ssid, ssid_len);
-       if (bss == NULL) {
-               u8 iface_addr[ETH_ALEN];
-               if (p2p_get_interface_addr(wpa_s->global->p2p, bssid,
-                                          iface_addr) == 0)
-                       bss = wpa_bss_get(wpa_s, iface_addr, ssid, ssid_len);
-       }
-       if (bss == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Could not figure out whether "
-                          "group is persistent - BSS " MACSTR " not found",
-                          MAC2STR(bssid));
-               return 0;
-       }
-
-       p2p = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
-       if (p2p == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Could not figure out whether "
-                          "group is persistent - BSS " MACSTR
-                          " did not include P2P IE", MAC2STR(bssid));
-               wpa_hexdump(MSG_DEBUG, "P2P: Probe Response IEs",
-                           (u8 *) (bss + 1), bss->ie_len);
-               wpa_hexdump(MSG_DEBUG, "P2P: Beacon IEs",
-                           ((u8 *) bss + 1) + bss->ie_len,
-                           bss->beacon_ie_len);
-               return 0;
-       }
-
-       group_capab = p2p_get_group_capab(p2p);
-       addr = p2p_get_go_dev_addr(p2p);
-       wpa_printf(MSG_DEBUG, "P2P: Checking whether group is persistent: "
-                  "group_capab=0x%x", group_capab);
-       if (addr) {
-               os_memcpy(go_dev_addr, addr, ETH_ALEN);
-               wpa_printf(MSG_DEBUG, "P2P: GO Device Address " MACSTR,
-                          MAC2STR(addr));
-       } else
-               os_memset(go_dev_addr, 0, ETH_ALEN);
-       wpabuf_free(p2p);
-
-       wpa_printf(MSG_DEBUG, "P2P: BSS " MACSTR " group_capab=0x%x "
-                  "go_dev_addr=" MACSTR,
-                  MAC2STR(bssid), group_capab, MAC2STR(go_dev_addr));
-
-       return group_capab & P2P_GROUP_CAPAB_PERSISTENT_GROUP;
-}
-
-
-static void wpas_p2p_store_persistent_group(struct wpa_supplicant *wpa_s,
-                                           struct wpa_ssid *ssid,
-                                           const u8 *go_dev_addr)
-{
-       struct wpa_ssid *s;
-       int changed = 0;
-
-       wpa_printf(MSG_DEBUG, "P2P: Storing credentials for a persistent "
-                  "group (GO Dev Addr " MACSTR ")", MAC2STR(go_dev_addr));
-       for (s = wpa_s->conf->ssid; s; s = s->next) {
-               if (s->disabled == 2 &&
-                   os_memcmp(go_dev_addr, s->bssid, ETH_ALEN) == 0 &&
-                   s->ssid_len == ssid->ssid_len &&
-                   os_memcmp(ssid->ssid, s->ssid, ssid->ssid_len) == 0)
-                       break;
-       }
-
-       if (s) {
-               wpa_printf(MSG_DEBUG, "P2P: Update existing persistent group "
-                          "entry");
-               if (ssid->passphrase && !s->passphrase)
-                       changed = 1;
-               else if (ssid->passphrase && s->passphrase &&
-                        os_strcmp(ssid->passphrase, s->passphrase) != 0)
-                       changed = 1;
-       } else {
-               wpa_printf(MSG_DEBUG, "P2P: Create a new persistent group "
-                          "entry");
-               changed = 1;
-               s = wpa_config_add_network(wpa_s->conf);
-               if (s == NULL)
-                       return;
-               wpa_config_set_network_defaults(s);
-       }
-
-       s->p2p_group = 1;
-       s->p2p_persistent_group = 1;
-       s->disabled = 2;
-       s->bssid_set = 1;
-       os_memcpy(s->bssid, go_dev_addr, ETH_ALEN);
-       s->mode = ssid->mode;
-       s->auth_alg = WPA_AUTH_ALG_OPEN;
-       s->key_mgmt = WPA_KEY_MGMT_PSK;
-       s->proto = WPA_PROTO_RSN;
-       s->pairwise_cipher = WPA_CIPHER_CCMP;
-       if (ssid->passphrase) {
-               os_free(s->passphrase);
-               s->passphrase = os_strdup(ssid->passphrase);
-       }
-       if (ssid->psk_set) {
-               s->psk_set = 1;
-               os_memcpy(s->psk, ssid->psk, 32);
-       }
-       if (s->passphrase && !s->psk_set)
-               wpa_config_update_psk(s);
-       if (s->ssid == NULL || s->ssid_len < ssid->ssid_len) {
-               os_free(s->ssid);
-               s->ssid = os_malloc(ssid->ssid_len);
-       }
-       if (s->ssid) {
-               s->ssid_len = ssid->ssid_len;
-               os_memcpy(s->ssid, ssid->ssid, s->ssid_len);
-       }
-
-#ifndef CONFIG_NO_CONFIG_WRITE
-       if (changed && wpa_s->conf->update_config &&
-           wpa_config_write(wpa_s->confname, wpa_s->conf)) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to update configuration");
-       }
-#endif /* CONFIG_NO_CONFIG_WRITE */
-}
-
-
-static void wpas_group_formation_completed(struct wpa_supplicant *wpa_s,
-                                          int success)
-{
-       struct wpa_ssid *ssid;
-       const char *ssid_txt;
-       int client;
-       int persistent;
-       u8 go_dev_addr[ETH_ALEN];
-
-       /*
-        * This callback is likely called for the main interface. Update wpa_s
-        * to use the group interface if a new interface was created for the
-        * group.
-        */
-       if (wpa_s->global->p2p_group_formation)
-               wpa_s = wpa_s->global->p2p_group_formation;
-       wpa_s->p2p_in_provisioning = 0;
-
-       if (!success) {
-               wpa_msg(wpa_s->parent, MSG_INFO,
-                       P2P_EVENT_GROUP_FORMATION_FAILURE);
-               wpas_p2p_group_delete(wpa_s);
-               return;
-       }
-
-       wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_FORMATION_SUCCESS);
-
-       ssid = wpa_s->current_ssid;
-       if (ssid && ssid->mode == WPAS_MODE_P2P_GROUP_FORMATION) {
-               ssid->mode = WPAS_MODE_P2P_GO;
-               p2p_group_notif_formation_done(wpa_s->p2p_group);
-               wpa_supplicant_ap_mac_addr_filter(wpa_s, NULL);
-       }
-
-       persistent = 0;
-       if (ssid) {
-               ssid_txt = wpa_ssid_txt(ssid->ssid, ssid->ssid_len);
-               client = ssid->mode == WPAS_MODE_INFRA;
-               if (ssid->mode == WPAS_MODE_P2P_GO) {
-                       persistent = ssid->p2p_persistent_group;
-                       os_memcpy(go_dev_addr, wpa_s->parent->own_addr,
-                                 ETH_ALEN);
-               } else
-                       persistent = wpas_p2p_persistent_group(wpa_s,
-                                                              go_dev_addr,
-                                                              ssid->ssid,
-                                                              ssid->ssid_len);
-       } else {
-               ssid_txt = "";
-               client = wpa_s->p2p_group_interface ==
-                       P2P_GROUP_INTERFACE_CLIENT;
-       }
-
-       wpa_s->show_group_started = 0;
-       if (client) {
-               /*
-                * Indicate event only after successfully completed 4-way
-                * handshake, i.e., when the interface is ready for data
-                * packets.
-                */
-               wpa_s->show_group_started = 1;
-       } else if (ssid && ssid->passphrase == NULL && ssid->psk_set) {
-               char psk[65];
-               wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
-               wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
-                       "%s GO ssid=\"%s\" freq=%d psk=%s go_dev_addr=" MACSTR
-                       "%s",
-                       wpa_s->ifname, ssid_txt, ssid->frequency, psk,
-                       MAC2STR(go_dev_addr),
-                       persistent ? " [PERSISTENT]" : "");
-               wpas_p2p_cross_connect_setup(wpa_s);
-       } else {
-               wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
-                       "%s GO ssid=\"%s\" freq=%d passphrase=\"%s\" "
-                       "go_dev_addr=" MACSTR "%s",
-                       wpa_s->ifname, ssid_txt, ssid->frequency,
-                       ssid && ssid->passphrase ? ssid->passphrase : "",
-                       MAC2STR(go_dev_addr),
-                       persistent ? " [PERSISTENT]" : "");
-               wpas_p2p_cross_connect_setup(wpa_s);
-       }
-
-       if (persistent)
-               wpas_p2p_store_persistent_group(wpa_s->parent, ssid,
-                                               go_dev_addr);
-}
-
-
-static void wpas_send_action_cb(void *eloop_ctx, void *timeout_ctx)
-{
-       struct wpa_supplicant *wpa_s = eloop_ctx;
-       struct wpa_supplicant *iface;
-       int res;
-       int without_roc;
-
-       without_roc = wpa_s->pending_action_without_roc;
-       wpa_s->pending_action_without_roc = 0;
-       wpa_printf(MSG_DEBUG, "P2P: Send Action callback (without_roc=%d "
-                  "pending_action_tx=%p)",
-                  without_roc, wpa_s->pending_action_tx);
-
-       if (wpa_s->pending_action_tx == NULL)
-               return;
-
-       if (wpa_s->off_channel_freq != wpa_s->pending_action_freq &&
-           wpa_s->pending_action_freq != 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Pending Action frame TX "
-                          "waiting for another freq=%u (off_channel_freq=%u)",
-                          wpa_s->pending_action_freq,
-                          wpa_s->off_channel_freq);
-               if (without_roc && wpa_s->off_channel_freq == 0) {
-                       /*
-                        * We may get here if wpas_send_action() found us to be
-                        * on the correct channel, but remain-on-channel cancel
-                        * event was received before getting here.
-                        */
-                       wpa_printf(MSG_DEBUG, "P2P: Schedule "
-                                  "remain-on-channel to send Action frame");
-                       if (wpa_drv_remain_on_channel(
-                                   wpa_s, wpa_s->pending_action_freq, 200) <
-                           0) {
-                               wpa_printf(MSG_DEBUG, "P2P: Failed to request "
-                                          "driver to remain on channel (%u "
-                                          "MHz) for Action Frame TX",
-                                          wpa_s->pending_action_freq);
-                       } else
-                               wpa_s->roc_waiting_drv_freq =
-                                       wpa_s->pending_action_freq;
-               }
-               return;
-       }
-
-       /*
-        * This call is likely going to be on the P2P device instance if the
-        * driver uses a separate interface for that purpose. However, some
-        * Action frames are actually sent within a P2P Group and when that is
-        * the case, we need to follow power saving (e.g., GO buffering the
-        * frame for a client in PS mode or a client following the advertised
-        * NoA from its GO). To make that easier for the driver, select the
-        * correct group interface here.
-        */
-       if (os_memcmp(wpa_s->pending_action_src, wpa_s->own_addr, ETH_ALEN) !=
-           0) {
-               /*
-                * Try to find a group interface that matches with the source
-                * address.
-                */
-               iface = wpa_s->global->ifaces;
-               while (iface) {
-                       if (os_memcmp(wpa_s->pending_action_src,
-                                     iface->own_addr, ETH_ALEN) == 0)
-                               break;
-                       iface = iface->next;
-               }
-               if (iface) {
-                       wpa_printf(MSG_DEBUG, "P2P: Use group interface %s "
-                                  "instead of interface %s for Action TX",
-                                  iface->ifname, wpa_s->ifname);
-               } else
-                       iface = wpa_s;
-       } else
-               iface = wpa_s;
-
-       wpa_printf(MSG_DEBUG, "P2P: Sending pending Action frame to "
-                  MACSTR " using interface %s",
-                  MAC2STR(wpa_s->pending_action_dst), iface->ifname);
-       res = wpa_drv_send_action(iface, wpa_s->pending_action_freq,
-                                 wpa_s->pending_action_dst,
-                                 wpa_s->pending_action_src,
-                                 wpa_s->pending_action_bssid,
-                                 wpabuf_head(wpa_s->pending_action_tx),
-                                 wpabuf_len(wpa_s->pending_action_tx));
-       if (res) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to send the pending "
-                          "Action frame");
-               /*
-                * Use fake TX status event to allow P2P state machine to
-                * continue.
-                */
-               wpas_send_action_tx_status(
-                       wpa_s, wpa_s->pending_action_dst,
-                       wpabuf_head(wpa_s->pending_action_tx),
-                       wpabuf_len(wpa_s->pending_action_tx), 0);
-       }
-}
-
-
-void wpas_send_action_tx_status(struct wpa_supplicant *wpa_s, const u8 *dst,
-                               const u8 *data, size_t data_len, int ack)
-{
-       if (wpa_s->global->p2p_disabled)
-               return;
-
-       if (wpa_s->pending_action_tx == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Ignore Action TX status - no "
-                          "pending operation");
-               return;
-       }
-
-       if (os_memcmp(dst, wpa_s->pending_action_dst, ETH_ALEN) != 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Ignore Action TX status - unknown "
-                          "destination address");
-               return;
-       }
-
-       wpabuf_free(wpa_s->pending_action_tx);
-       wpa_s->pending_action_tx = NULL;
-
-       p2p_send_action_cb(wpa_s->global->p2p, wpa_s->pending_action_freq,
-                          wpa_s->pending_action_dst,
-                          wpa_s->pending_action_src,
-                          wpa_s->pending_action_bssid,
-                          ack);
-
-       if (wpa_s->pending_pd_before_join &&
-           (os_memcmp(wpa_s->pending_action_dst, wpa_s->pending_join_dev_addr,
-                      ETH_ALEN) == 0 ||
-            os_memcmp(wpa_s->pending_action_dst,
-                      wpa_s->pending_join_iface_addr, ETH_ALEN) == 0)) {
-               wpa_s->pending_pd_before_join = 0;
-               wpa_printf(MSG_DEBUG, "P2P: Starting pending "
-                          "join-existing-group operation");
-               wpas_p2p_join_start(wpa_s);
-       }
-}
-
-
-static int wpas_send_action(void *ctx, unsigned int freq, const u8 *dst,
-                           const u8 *src, const u8 *bssid, const u8 *buf,
-                           size_t len, unsigned int wait_time)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-
-       wpa_printf(MSG_DEBUG, "P2P: Send action frame: freq=%d dst=" MACSTR
-                  " src=" MACSTR " bssid=" MACSTR " len=%d",
-                  freq, MAC2STR(dst), MAC2STR(src), MAC2STR(bssid),
-                  (int) len);
-
-       if (wpa_s->pending_action_tx) {
-               wpa_printf(MSG_DEBUG, "P2P: Dropped pending Action frame TX "
-                          "to " MACSTR, MAC2STR(wpa_s->pending_action_dst));
-               wpabuf_free(wpa_s->pending_action_tx);
-       }
-       wpa_s->pending_action_tx = wpabuf_alloc(len);
-       if (wpa_s->pending_action_tx == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to allocate Action frame "
-                          "TX buffer (len=%llu)", (unsigned long long) len);
-               return -1;
-       }
-       wpabuf_put_data(wpa_s->pending_action_tx, buf, len);
-       os_memcpy(wpa_s->pending_action_src, src, ETH_ALEN);
-       os_memcpy(wpa_s->pending_action_dst, dst, ETH_ALEN);
-       os_memcpy(wpa_s->pending_action_bssid, bssid, ETH_ALEN);
-       wpa_s->pending_action_freq = freq;
-
-       if (wpa_s->off_channel_freq == freq || freq == 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Already on requested channel; "
-                          "send Action frame immediately");
-               /* TODO: Would there ever be need to extend the current
-                * duration on the channel? */
-               wpa_s->pending_action_without_roc = 1;
-               eloop_cancel_timeout(wpas_send_action_cb, wpa_s, NULL);
-               eloop_register_timeout(0, 0, wpas_send_action_cb, wpa_s, NULL);
-               return 0;
-       }
-       wpa_s->pending_action_without_roc = 0;
-
-       if (wpa_s->roc_waiting_drv_freq == freq) {
-               wpa_printf(MSG_DEBUG, "P2P: Already waiting for driver to get "
-                          "to frequency %u MHz; continue waiting to send the "
-                          "Action frame", freq);
-               return 0;
-       }
-
-       wpa_printf(MSG_DEBUG, "P2P: Schedule Action frame to be transmitted "
-                  "once the driver gets to the requested channel");
-       if (wait_time > wpa_s->max_remain_on_chan)
-               wait_time = wpa_s->max_remain_on_chan;
-       if (wpa_drv_remain_on_channel(wpa_s, freq, wait_time) < 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to request driver "
-                          "to remain on channel (%u MHz) for Action "
-                          "Frame TX", freq);
-               return -1;
-       }
-       wpa_s->roc_waiting_drv_freq = freq;
-
-       return 0;
-}
-
-
-static void wpas_send_action_done(void *ctx)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       wpa_printf(MSG_DEBUG, "P2P: Action frame sequence done notification");
-       wpabuf_free(wpa_s->pending_action_tx);
-       wpa_s->pending_action_tx = NULL;
-       if (wpa_s->off_channel_freq) {
-               wpa_drv_cancel_remain_on_channel(wpa_s);
-               wpa_s->off_channel_freq = 0;
-               wpa_s->roc_waiting_drv_freq = 0;
-       }
-}
-
-
-static int wpas_copy_go_neg_results(struct wpa_supplicant *wpa_s,
-                                   struct p2p_go_neg_results *params)
-{
-       if (wpa_s->go_params == NULL) {
-               wpa_s->go_params = os_malloc(sizeof(*params));
-               if (wpa_s->go_params == NULL)
-                       return -1;
-       }
-       os_memcpy(wpa_s->go_params, params, sizeof(*params));
-       return 0;
-}
-
-
-static void wpas_start_wps_enrollee(struct wpa_supplicant *wpa_s,
-                                   struct p2p_go_neg_results *res)
-{
-       wpa_printf(MSG_DEBUG, "P2P: Start WPS Enrollee for peer " MACSTR,
-                  MAC2STR(res->peer_interface_addr));
-       wpa_hexdump_ascii(MSG_DEBUG, "P2P: Start WPS Enrollee for SSID",
-                         res->ssid, res->ssid_len);
-       wpa_supplicant_ap_deinit(wpa_s);
-       wpas_copy_go_neg_results(wpa_s, res);
-       if (res->wps_method == WPS_PBC)
-               wpas_wps_start_pbc(wpa_s, res->peer_interface_addr, 1);
-       else {
-               u16 dev_pw_id = DEV_PW_DEFAULT;
-               if (wpa_s->p2p_wps_method == WPS_PIN_KEYPAD)
-                       dev_pw_id = DEV_PW_REGISTRAR_SPECIFIED;
-               wpas_wps_start_pin(wpa_s, res->peer_interface_addr,
-                                  wpa_s->p2p_pin, 1, dev_pw_id);
-       }
-}
-
-
-static void p2p_go_configured(void *ctx, void *data)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       struct p2p_go_neg_results *params = data;
-       struct wpa_ssid *ssid;
-
-       ssid = wpa_s->current_ssid;
-       if (ssid && ssid->mode == WPAS_MODE_P2P_GO) {
-               wpa_printf(MSG_DEBUG, "P2P: Group setup without provisioning");
-               wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
-                       "%s GO ssid=\"%s\" freq=%d passphrase=\"%s\" "
-                       "go_dev_addr=" MACSTR "%s",
-                       wpa_s->ifname,
-                       wpa_ssid_txt(ssid->ssid, ssid->ssid_len),
-                       ssid->frequency,
-                       params->passphrase ? params->passphrase : "",
-                       MAC2STR(wpa_s->parent->own_addr),
-                       params->persistent_group ? " [PERSISTENT]" : "");
-               if (params->persistent_group)
-                       wpas_p2p_store_persistent_group(
-                               wpa_s->parent, ssid,
-                               wpa_s->parent->own_addr);
-               wpas_p2p_cross_connect_setup(wpa_s);
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "P2P: Setting up WPS for GO provisioning");
-       if (wpa_supplicant_ap_mac_addr_filter(wpa_s,
-                                             params->peer_interface_addr)) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to setup MAC address "
-                          "filtering");
-               return;
-       }
-       if (params->wps_method == WPS_PBC)
-               wpa_supplicant_ap_wps_pbc(wpa_s, params->peer_interface_addr);
-       else if (wpa_s->p2p_pin[0])
-               wpa_supplicant_ap_wps_pin(wpa_s, params->peer_interface_addr,
-                                         wpa_s->p2p_pin, NULL, 0);
-       os_free(wpa_s->go_params);
-       wpa_s->go_params = NULL;
-}
-
-
-static void wpas_start_wps_go(struct wpa_supplicant *wpa_s,
-                             struct p2p_go_neg_results *params,
-                             int group_formation)
-{
-       struct wpa_ssid *ssid;
-
-       if (wpas_copy_go_neg_results(wpa_s, params) < 0)
-               return;
-
-       ssid = wpa_config_add_network(wpa_s->conf);
-       if (ssid == NULL)
-               return;
-
-       wpa_config_set_network_defaults(ssid);
-       ssid->temporary = 1;
-       ssid->p2p_group = 1;
-       ssid->p2p_persistent_group = params->persistent_group;
-       ssid->mode = group_formation ? WPAS_MODE_P2P_GROUP_FORMATION :
-               WPAS_MODE_P2P_GO;
-       ssid->frequency = params->freq;
-       ssid->ssid = os_zalloc(params->ssid_len + 1);
-       if (ssid->ssid) {
-               os_memcpy(ssid->ssid, params->ssid, params->ssid_len);
-               ssid->ssid_len = params->ssid_len;
-       }
-       ssid->auth_alg = WPA_AUTH_ALG_OPEN;
-       ssid->key_mgmt = WPA_KEY_MGMT_PSK;
-       ssid->proto = WPA_PROTO_RSN;
-       ssid->pairwise_cipher = WPA_CIPHER_CCMP;
-       ssid->passphrase = os_strdup(params->passphrase);
-
-       wpa_s->ap_configured_cb = p2p_go_configured;
-       wpa_s->ap_configured_cb_ctx = wpa_s;
-       wpa_s->ap_configured_cb_data = wpa_s->go_params;
-       wpa_s->connect_without_scan = 1;
-       wpa_s->reassociate = 1;
-       wpa_s->disconnected = 0;
-       wpa_supplicant_req_scan(wpa_s, 0, 0);
-}
-
-
-static void wpas_p2p_clone_config(struct wpa_supplicant *dst,
-                                 const struct wpa_supplicant *src)
-{
-       struct wpa_config *d;
-       const struct wpa_config *s;
-
-       d = dst->conf;
-       s = src->conf;
-
-#define C(n) if (s->n) d->n = os_strdup(s->n)
-       C(device_name);
-       C(manufacturer);
-       C(model_name);
-       C(model_number);
-       C(serial_number);
-       C(device_type);
-       C(config_methods);
-#undef C
-}
-
-
-static int wpas_p2p_add_group_interface(struct wpa_supplicant *wpa_s,
-                                       enum wpa_driver_if_type type)
-{
-       char ifname[120], force_ifname[120];
-
-       if (wpa_s->pending_interface_name[0]) {
-               wpa_printf(MSG_DEBUG, "P2P: Pending virtual interface exists "
-                          "- skip creation of a new one");
-               if (is_zero_ether_addr(wpa_s->pending_interface_addr)) {
-                       wpa_printf(MSG_DEBUG, "P2P: Pending virtual address "
-                                  "unknown?! ifname='%s'",
-                                  wpa_s->pending_interface_name);
-                       return -1;
-               }
-               return 0;
-       }
-
-       os_snprintf(ifname, sizeof(ifname), "%s-p2p-%d", wpa_s->ifname,
-                   wpa_s->p2p_group_idx);
-       force_ifname[0] = '\0';
-
-       wpa_printf(MSG_DEBUG, "P2P: Create a new interface %s for the group",
-                  ifname);
-       wpa_s->p2p_group_idx++;
-
-       wpa_s->pending_interface_type = type;
-       if (wpa_drv_if_add(wpa_s, type, ifname, NULL, NULL, force_ifname,
-                          wpa_s->pending_interface_addr) < 0) {
-               wpa_printf(MSG_ERROR, "P2P: Failed to create new group "
-                          "interface");
-               return -1;
-       }
-
-       if (force_ifname[0]) {
-               wpa_printf(MSG_DEBUG, "P2P: Driver forced interface name %s",
-                          force_ifname);
-               os_strlcpy(wpa_s->pending_interface_name, force_ifname,
-                          sizeof(wpa_s->pending_interface_name));
-       } else
-               os_strlcpy(wpa_s->pending_interface_name, ifname,
-                          sizeof(wpa_s->pending_interface_name));
-       wpa_printf(MSG_DEBUG, "P2P: Created pending virtual interface %s addr "
-                  MACSTR, wpa_s->pending_interface_name,
-                  MAC2STR(wpa_s->pending_interface_addr));
-
-       return 0;
-}
-
-
-static void wpas_p2p_remove_pending_group_interface(
-       struct wpa_supplicant *wpa_s)
-{
-       if (!wpa_s->pending_interface_name[0] ||
-           is_zero_ether_addr(wpa_s->pending_interface_addr))
-               return; /* No pending virtual interface */
-
-       wpa_printf(MSG_DEBUG, "P2P: Removing pending group interface %s",
-                  wpa_s->pending_interface_name);
-       wpa_drv_if_remove(wpa_s, wpa_s->pending_interface_type,
-                         wpa_s->pending_interface_name);
-       os_memset(wpa_s->pending_interface_addr, 0, ETH_ALEN);
-       wpa_s->pending_interface_name[0] = '\0';
-}
-
-
-static struct wpa_supplicant *
-wpas_p2p_init_group_interface(struct wpa_supplicant *wpa_s, int go)
-{
-       struct wpa_interface iface;
-       struct wpa_supplicant *group_wpa_s;
-
-       if (!wpa_s->pending_interface_name[0]) {
-               wpa_printf(MSG_ERROR, "P2P: No pending group interface");
-               return NULL;
-       }
-
-       os_memset(&iface, 0, sizeof(iface));
-       iface.ifname = wpa_s->pending_interface_name;
-       iface.driver = wpa_s->driver->name;
-       iface.ctrl_interface = wpa_s->conf->ctrl_interface;
-       iface.driver_param = wpa_s->conf->driver_param;
-       group_wpa_s = wpa_supplicant_add_iface(wpa_s->global, &iface);
-       if (group_wpa_s == NULL) {
-               wpa_printf(MSG_ERROR, "P2P: Failed to create new "
-                          "wpa_supplicant interface");
-               return NULL;
-       }
-       wpa_s->pending_interface_name[0] = '\0';
-       group_wpa_s->parent = wpa_s;
-       group_wpa_s->p2p_group_interface = go ? P2P_GROUP_INTERFACE_GO :
-               P2P_GROUP_INTERFACE_CLIENT;
-       wpa_s->global->p2p_group_formation = group_wpa_s;
-
-       wpas_p2p_clone_config(group_wpa_s, wpa_s);
-
-       return group_wpa_s;
-}
-
-
-static void wpas_p2p_group_formation_timeout(void *eloop_ctx,
-                                            void *timeout_ctx)
-{
-       struct wpa_supplicant *wpa_s = eloop_ctx;
-       wpa_printf(MSG_DEBUG, "P2P: Group Formation timed out");
-       if (wpa_s->global->p2p)
-               p2p_group_formation_failed(wpa_s->global->p2p);
-       wpas_group_formation_completed(wpa_s, 0);
-}
-
-
-void wpas_go_neg_completed(void *ctx, struct p2p_go_neg_results *res)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-
-       if (wpa_s->off_channel_freq) {
-               wpa_drv_cancel_remain_on_channel(wpa_s);
-               wpa_s->off_channel_freq = 0;
-               wpa_s->roc_waiting_drv_freq = 0;
-       }
-
-       if (res->status) {
-               wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_GO_NEG_FAILURE "status=%d",
-                       res->status);
-               wpas_p2p_remove_pending_group_interface(wpa_s);
-               return;
-       }
-
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_GO_NEG_SUCCESS);
-
-       if (wpa_s->create_p2p_iface) {
-               struct wpa_supplicant *group_wpa_s =
-                       wpas_p2p_init_group_interface(wpa_s, res->role_go);
-               if (group_wpa_s == NULL) {
-                       wpas_p2p_remove_pending_group_interface(wpa_s);
-                       return;
-               }
-               if (group_wpa_s != wpa_s) {
-                       os_memcpy(group_wpa_s->p2p_pin, wpa_s->p2p_pin,
-                                 sizeof(group_wpa_s->p2p_pin));
-                       group_wpa_s->p2p_wps_method = wpa_s->p2p_wps_method;
-               }
-               os_memset(wpa_s->pending_interface_addr, 0, ETH_ALEN);
-               wpa_s->pending_interface_name[0] = '\0';
-               group_wpa_s->p2p_in_provisioning = 1;
-
-               if (res->role_go)
-                       wpas_start_wps_go(group_wpa_s, res, 1);
-               else
-                       wpas_start_wps_enrollee(group_wpa_s, res);
-       } else {
-               wpa_s->p2p_in_provisioning = 1;
-               wpa_s->global->p2p_group_formation = wpa_s;
-
-               if (res->role_go)
-                       wpas_start_wps_go(wpa_s, res, 1);
-               else
-                       wpas_start_wps_enrollee(ctx, res);
-       }
-
-       wpa_s->p2p_long_listen = 0;
-       eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
-
-       eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
-       eloop_register_timeout(15 + res->peer_config_timeout / 100,
-                              (res->peer_config_timeout % 100) * 10000,
-                              wpas_p2p_group_formation_timeout, wpa_s, NULL);
-}
-
-
-void wpas_go_neg_req_rx(void *ctx, const u8 *src, u16 dev_passwd_id)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_GO_NEG_REQUEST MACSTR
-               " dev_passwd_id=%u", MAC2STR(src), dev_passwd_id);
-}
-
-
-void wpas_dev_found(void *ctx, const u8 *addr, const u8 *dev_addr,
-                   const u8 *pri_dev_type, const char *dev_name,
-                   u16 config_methods, u8 dev_capab, u8 group_capab)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       char devtype[WPS_DEV_TYPE_BUFSIZE];
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_DEVICE_FOUND MACSTR
-               " p2p_dev_addr=" MACSTR
-               " pri_dev_type=%s name='%s' config_methods=0x%x "
-               "dev_capab=0x%x group_capab=0x%x",
-               MAC2STR(addr), MAC2STR(dev_addr),
-               wps_dev_type_bin2str(pri_dev_type, devtype, sizeof(devtype)),
-               dev_name, config_methods, dev_capab, group_capab);
-}
-
-
-static int wpas_start_listen(void *ctx, unsigned int freq,
-                            unsigned int duration,
-                            const struct wpabuf *probe_resp_ie)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-
-       wpa_drv_set_ap_wps_ie(wpa_s, NULL, probe_resp_ie, NULL);
-
-       if (wpa_drv_probe_req_report(wpa_s, 1) < 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to request the driver to "
-                          "report received Probe Request frames");
-               return -1;
-       }
-
-       wpa_s->pending_listen_freq = freq;
-       wpa_s->pending_listen_duration = duration;
-
-       if (wpa_drv_remain_on_channel(wpa_s, freq, duration) < 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to request the driver "
-                          "to remain on channel (%u MHz) for Listen "
-                          "state", freq);
-               wpa_s->pending_listen_freq = 0;
-               return -1;
-       }
-       wpa_s->roc_waiting_drv_freq = freq;
-
-       return 0;
-}
-
-
-static void wpas_stop_listen(void *ctx)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s->off_channel_freq || wpa_s->roc_waiting_drv_freq) {
-               wpa_drv_cancel_remain_on_channel(wpa_s);
-               wpa_s->off_channel_freq = 0;
-               wpa_s->roc_waiting_drv_freq = 0;
-       }
-       wpa_drv_probe_req_report(wpa_s, 0);
-}
-
-
-static int wpas_send_probe_resp(void *ctx, const struct wpabuf *buf)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       return wpa_drv_send_mlme(wpa_s, wpabuf_head(buf), wpabuf_len(buf));
-}
-
-
-static struct p2p_srv_bonjour *
-wpas_p2p_service_get_bonjour(struct wpa_supplicant *wpa_s,
-                            const struct wpabuf *query)
-{
-       struct p2p_srv_bonjour *bsrv;
-       size_t len;
-
-       len = wpabuf_len(query);
-       dl_list_for_each(bsrv, &wpa_s->global->p2p_srv_bonjour,
-                        struct p2p_srv_bonjour, list) {
-               if (len == wpabuf_len(bsrv->query) &&
-                   os_memcmp(wpabuf_head(query), wpabuf_head(bsrv->query),
-                             len) == 0)
-                       return bsrv;
-       }
-       return NULL;
-}
-
-
-static struct p2p_srv_upnp *
-wpas_p2p_service_get_upnp(struct wpa_supplicant *wpa_s, u8 version,
-                         const char *service)
-{
-       struct p2p_srv_upnp *usrv;
-
-       dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
-                        struct p2p_srv_upnp, list) {
-               if (version == usrv->version &&
-                   os_strcmp(service, usrv->service) == 0)
-                       return usrv;
-       }
-       return NULL;
-}
-
-
-static void wpas_sd_add_proto_not_avail(struct wpabuf *resp, u8 srv_proto,
-                                       u8 srv_trans_id)
-{
-       u8 *len_pos;
-
-       if (wpabuf_tailroom(resp) < 5)
-               return;
-
-       /* Length (to be filled) */
-       len_pos = wpabuf_put(resp, 2);
-       wpabuf_put_u8(resp, srv_proto);
-       wpabuf_put_u8(resp, srv_trans_id);
-       /* Status Code */
-       wpabuf_put_u8(resp, P2P_SD_PROTO_NOT_AVAILABLE);
-       /* Response Data: empty */
-       WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
-}
-
-
-static void wpas_sd_all_bonjour(struct wpa_supplicant *wpa_s,
-                               struct wpabuf *resp, u8 srv_trans_id)
-{
-       struct p2p_srv_bonjour *bsrv;
-       u8 *len_pos;
-
-       wpa_printf(MSG_DEBUG, "P2P: SD Request for all Bonjour services");
-
-       if (dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
-               wpa_printf(MSG_DEBUG, "P2P: Bonjour protocol not available");
-               return;
-       }
-
-       dl_list_for_each(bsrv, &wpa_s->global->p2p_srv_bonjour,
-                        struct p2p_srv_bonjour, list) {
-               if (wpabuf_tailroom(resp) <
-                   5 + wpabuf_len(bsrv->query) + wpabuf_len(bsrv->resp))
-                       return;
-               /* Length (to be filled) */
-               len_pos = wpabuf_put(resp, 2);
-               wpabuf_put_u8(resp, P2P_SERV_BONJOUR);
-               wpabuf_put_u8(resp, srv_trans_id);
-               /* Status Code */
-               wpabuf_put_u8(resp, P2P_SD_SUCCESS);
-               wpa_hexdump_ascii(MSG_DEBUG, "P2P: Matching Bonjour service",
-                                 wpabuf_head(bsrv->resp),
-                                 wpabuf_len(bsrv->resp));
-               /* Response Data */
-               wpabuf_put_buf(resp, bsrv->query); /* Key */
-               wpabuf_put_buf(resp, bsrv->resp); /* Value */
-               WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
-                            2);
-       }
-}
-
-
-static void wpas_sd_req_bonjour(struct wpa_supplicant *wpa_s,
-                               struct wpabuf *resp, u8 srv_trans_id,
-                               const u8 *query, size_t query_len)
-{
-       struct p2p_srv_bonjour *bsrv;
-       struct wpabuf buf;
-       u8 *len_pos;
-
-       wpa_hexdump_ascii(MSG_DEBUG, "P2P: SD Request for Bonjour",
-                         query, query_len);
-       if (dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
-               wpa_printf(MSG_DEBUG, "P2P: Bonjour protocol not available");
-               wpas_sd_add_proto_not_avail(resp, P2P_SERV_BONJOUR,
-                                           srv_trans_id);
-               return;
-       }
-
-       if (query_len == 0) {
-               wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
-               return;
-       }
-
-       if (wpabuf_tailroom(resp) < 5)
-               return;
-       /* Length (to be filled) */
-       len_pos = wpabuf_put(resp, 2);
-       wpabuf_put_u8(resp, P2P_SERV_BONJOUR);
-       wpabuf_put_u8(resp, srv_trans_id);
-
-       wpabuf_set(&buf, query, query_len);
-       bsrv = wpas_p2p_service_get_bonjour(wpa_s, &buf);
-       if (bsrv == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Requested Bonjour service not "
-                          "available");
-
-               /* Status Code */
-               wpabuf_put_u8(resp, P2P_SD_REQUESTED_INFO_NOT_AVAILABLE);
-               /* Response Data: empty */
-               WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
-                            2);
-               return;
-       }
-
-       /* Status Code */
-       wpabuf_put_u8(resp, P2P_SD_SUCCESS);
-       wpa_hexdump_ascii(MSG_DEBUG, "P2P: Matching Bonjour service",
-                         wpabuf_head(bsrv->resp), wpabuf_len(bsrv->resp));
-
-       if (wpabuf_tailroom(resp) >=
-           wpabuf_len(bsrv->query) + wpabuf_len(bsrv->resp)) {
-               /* Response Data */
-               wpabuf_put_buf(resp, bsrv->query); /* Key */
-               wpabuf_put_buf(resp, bsrv->resp); /* Value */
-       }
-       WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
-}
-
-
-static void wpas_sd_all_upnp(struct wpa_supplicant *wpa_s,
-                            struct wpabuf *resp, u8 srv_trans_id)
-{
-       struct p2p_srv_upnp *usrv;
-       u8 *len_pos;
-
-       wpa_printf(MSG_DEBUG, "P2P: SD Request for all UPnP services");
-
-       if (dl_list_empty(&wpa_s->global->p2p_srv_upnp)) {
-               wpa_printf(MSG_DEBUG, "P2P: UPnP protocol not available");
-               return;
-       }
-
-       dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
-                        struct p2p_srv_upnp, list) {
-               if (wpabuf_tailroom(resp) < 5 + 1 + os_strlen(usrv->service))
-                       return;
-
-               /* Length (to be filled) */
-               len_pos = wpabuf_put(resp, 2);
-               wpabuf_put_u8(resp, P2P_SERV_UPNP);
-               wpabuf_put_u8(resp, srv_trans_id);
-
-               /* Status Code */
-               wpabuf_put_u8(resp, P2P_SD_SUCCESS);
-               /* Response Data */
-               wpabuf_put_u8(resp, usrv->version);
-               wpa_printf(MSG_DEBUG, "P2P: Matching UPnP Service: %s",
-                          usrv->service);
-               wpabuf_put_str(resp, usrv->service);
-               WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos -
-                            2);
-       }
-}
-
-
-static void wpas_sd_req_upnp(struct wpa_supplicant *wpa_s,
-                            struct wpabuf *resp, u8 srv_trans_id,
-                            const u8 *query, size_t query_len)
-{
-       struct p2p_srv_upnp *usrv;
-       u8 *len_pos;
-       u8 version;
-       char *str;
-       int count = 0;
-
-       wpa_hexdump_ascii(MSG_DEBUG, "P2P: SD Request for UPnP",
-                         query, query_len);
-
-       if (dl_list_empty(&wpa_s->global->p2p_srv_upnp)) {
-               wpa_printf(MSG_DEBUG, "P2P: UPnP protocol not available");
-               wpas_sd_add_proto_not_avail(resp, P2P_SERV_UPNP,
-                                           srv_trans_id);
-               return;
-       }
-
-       if (query_len == 0) {
-               wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
-               return;
-       }
-
-       version = query[0];
-       str = os_malloc(query_len);
-       if (str == NULL)
-               return;
-       os_memcpy(str, query + 1, query_len - 1);
-       str[query_len - 1] = '\0';
-
-       if (wpabuf_tailroom(resp) < 5)
-               return;
-
-       /* Length (to be filled) */
-       len_pos = wpabuf_put(resp, 2);
-       wpabuf_put_u8(resp, P2P_SERV_UPNP);
-       wpabuf_put_u8(resp, srv_trans_id);
-
-       dl_list_for_each(usrv, &wpa_s->global->p2p_srv_upnp,
-                        struct p2p_srv_upnp, list) {
-               if (version != usrv->version)
-                       continue;
-
-               if (os_strcmp(str, "ssdp:all") != 0 &&
-                   os_strstr(usrv->service, str) == NULL)
-                       continue;
-
-               if (wpabuf_tailroom(resp) < 2)
-                       break;
-               if (count == 0) {
-                       /* Status Code */
-                       wpabuf_put_u8(resp, P2P_SD_SUCCESS);
-                       /* Response Data */
-                       wpabuf_put_u8(resp, version);
-               } else
-                       wpabuf_put_u8(resp, ',');
-
-               count++;
-
-               wpa_printf(MSG_DEBUG, "P2P: Matching UPnP Service: %s",
-                          usrv->service);
-               if (wpabuf_tailroom(resp) < os_strlen(usrv->service))
-                       break;
-               wpabuf_put_str(resp, usrv->service);
-       }
-
-       if (count == 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Requested UPnP service not "
-                          "available");
-               /* Status Code */
-               wpabuf_put_u8(resp, P2P_SD_REQUESTED_INFO_NOT_AVAILABLE);
-               /* Response Data: empty */
-       }
-
-       WPA_PUT_LE16(len_pos, (u8 *) wpabuf_put(resp, 0) - len_pos - 2);
-}
-
-
-void wpas_sd_request(void *ctx, int freq, const u8 *sa, u8 dialog_token,
-                    u16 update_indic, const u8 *tlvs, size_t tlvs_len)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       const u8 *pos = tlvs;
-       const u8 *end = tlvs + tlvs_len;
-       const u8 *tlv_end;
-       u16 slen;
-       struct wpabuf *resp;
-       u8 srv_proto, srv_trans_id;
-       size_t buf_len;
-       char *buf;
-
-       wpa_hexdump(MSG_MSGDUMP, "P2P: Service Discovery Request TLVs",
-                   tlvs, tlvs_len);
-       buf_len = 2 * tlvs_len + 1;
-       buf = os_malloc(buf_len);
-       if (buf) {
-               wpa_snprintf_hex(buf, buf_len, tlvs, tlvs_len);
-               wpa_msg_ctrl(wpa_s, MSG_INFO, P2P_EVENT_SERV_DISC_REQ "%d "
-                            MACSTR " %u %u %s",
-                            freq, MAC2STR(sa), dialog_token, update_indic,
-                            buf);
-               os_free(buf);
-       }
-
-       if (wpa_s->p2p_sd_over_ctrl_iface)
-               return; /* to be processed by an external program */
-
-       resp = wpabuf_alloc(10000);
-       if (resp == NULL)
-               return;
-
-       while (pos + 1 < end) {
-               wpa_printf(MSG_DEBUG, "P2P: Service Request TLV");
-               slen = WPA_GET_LE16(pos);
-               pos += 2;
-               if (pos + slen > end || slen < 2) {
-                       wpa_printf(MSG_DEBUG, "P2P: Unexpected Query Data "
-                                  "length");
-                       wpabuf_free(resp);
-                       return;
-               }
-               tlv_end = pos + slen;
-
-               srv_proto = *pos++;
-               wpa_printf(MSG_DEBUG, "P2P: Service Protocol Type %u",
-                          srv_proto);
-               srv_trans_id = *pos++;
-               wpa_printf(MSG_DEBUG, "P2P: Service Transaction ID %u",
-                          srv_trans_id);
-
-               wpa_hexdump(MSG_MSGDUMP, "P2P: Query Data",
-                           pos, tlv_end - pos);
-
-
-               if (wpa_s->force_long_sd) {
-                       wpa_printf(MSG_DEBUG, "P2P: SD test - force long "
-                                  "response");
-                       wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
-                       wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
-                       goto done;
-               }
-
-               switch (srv_proto) {
-               case P2P_SERV_ALL_SERVICES:
-                       wpa_printf(MSG_DEBUG, "P2P: Service Discovery Request "
-                                  "for all services");
-                       if (dl_list_empty(&wpa_s->global->p2p_srv_upnp) &&
-                           dl_list_empty(&wpa_s->global->p2p_srv_bonjour)) {
-                               wpa_printf(MSG_DEBUG, "P2P: No service "
-                                          "discovery protocols available");
-                               wpas_sd_add_proto_not_avail(
-                                       resp, P2P_SERV_ALL_SERVICES,
-                                       srv_trans_id);
-                               break;
-                       }
-                       wpas_sd_all_bonjour(wpa_s, resp, srv_trans_id);
-                       wpas_sd_all_upnp(wpa_s, resp, srv_trans_id);
-                       break;
-               case P2P_SERV_BONJOUR:
-                       wpas_sd_req_bonjour(wpa_s, resp, srv_trans_id,
-                                           pos, tlv_end - pos);
-                       break;
-               case P2P_SERV_UPNP:
-                       wpas_sd_req_upnp(wpa_s, resp, srv_trans_id,
-                                        pos, tlv_end - pos);
-                       break;
-               default:
-                       wpa_printf(MSG_DEBUG, "P2P: Unavailable service "
-                                  "protocol %u", srv_proto);
-                       wpas_sd_add_proto_not_avail(resp, srv_proto,
-                                                   srv_trans_id);
-                       break;
-               }
-
-               pos = tlv_end;
-       }
-
-done:
-       wpas_p2p_sd_response(wpa_s, freq, sa, dialog_token, resp);
-
-       wpabuf_free(resp);
-}
-
-
-void wpas_sd_response(void *ctx, const u8 *sa, u16 update_indic,
-                     const u8 *tlvs, size_t tlvs_len)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       const u8 *pos = tlvs;
-       const u8 *end = tlvs + tlvs_len;
-       const u8 *tlv_end;
-       u16 slen;
-       size_t buf_len;
-       char *buf;
-
-       wpa_hexdump(MSG_MSGDUMP, "P2P: Service Discovery Response TLVs",
-                   tlvs, tlvs_len);
-       if (tlvs_len > 1500) {
-               /* TODO: better way for handling this */
-               wpa_msg_ctrl(wpa_s, MSG_INFO,
-                            P2P_EVENT_SERV_DISC_RESP MACSTR
-                            " %u <long response: %u bytes>",
-                            MAC2STR(sa), update_indic,
-                            (unsigned int) tlvs_len);
-       } else {
-               buf_len = 2 * tlvs_len + 1;
-               buf = os_malloc(buf_len);
-               if (buf) {
-                       wpa_snprintf_hex(buf, buf_len, tlvs, tlvs_len);
-                       wpa_msg_ctrl(wpa_s, MSG_INFO,
-                                    P2P_EVENT_SERV_DISC_RESP MACSTR " %u %s",
-                                    MAC2STR(sa), update_indic, buf);
-                       os_free(buf);
-               }
-       }
-
-       while (pos < end) {
-               u8 srv_proto, srv_trans_id, status;
-
-               wpa_printf(MSG_DEBUG, "P2P: Service Response TLV");
-               slen = WPA_GET_LE16(pos);
-               pos += 2;
-               if (pos + slen > end || slen < 3) {
-                       wpa_printf(MSG_DEBUG, "P2P: Unexpected Response Data "
-                                  "length");
-                       return;
-               }
-               tlv_end = pos + slen;
-
-               srv_proto = *pos++;
-               wpa_printf(MSG_DEBUG, "P2P: Service Protocol Type %u",
-                          srv_proto);
-               srv_trans_id = *pos++;
-               wpa_printf(MSG_DEBUG, "P2P: Service Transaction ID %u",
-                          srv_trans_id);
-               status = *pos++;
-               wpa_printf(MSG_DEBUG, "P2P: Status Code ID %u",
-                          status);
-
-               wpa_hexdump(MSG_MSGDUMP, "P2P: Response Data",
-                           pos, tlv_end - pos);
-
-               pos = tlv_end;
-       }
-}
-
-
-void * wpas_p2p_sd_request(struct wpa_supplicant *wpa_s, const u8 *dst,
-                          const struct wpabuf *tlvs)
-{
-       return p2p_sd_request(wpa_s->global->p2p, dst, tlvs);
-}
-
-
-void * wpas_p2p_sd_request_upnp(struct wpa_supplicant *wpa_s, const u8 *dst,
-                               u8 version, const char *query)
-{
-       struct wpabuf *tlvs;
-       void *ret;
-
-       tlvs = wpabuf_alloc(2 + 1 + 1 + 1 + os_strlen(query));
-       if (tlvs == NULL)
-               return NULL;
-       wpabuf_put_le16(tlvs, 1 + 1 + 1 + os_strlen(query));
-       wpabuf_put_u8(tlvs, P2P_SERV_UPNP); /* Service Protocol Type */
-       wpabuf_put_u8(tlvs, 1); /* Service Transaction ID */
-       wpabuf_put_u8(tlvs, version);
-       wpabuf_put_str(tlvs, query);
-       ret = wpas_p2p_sd_request(wpa_s, dst, tlvs);
-       wpabuf_free(tlvs);
-       return ret;
-}
-
-
-int wpas_p2p_sd_cancel_request(struct wpa_supplicant *wpa_s, void *req)
-{
-       return p2p_sd_cancel_request(wpa_s->global->p2p, req);
-}
-
-
-void wpas_p2p_sd_response(struct wpa_supplicant *wpa_s, int freq,
-                         const u8 *dst, u8 dialog_token,
-                         const struct wpabuf *resp_tlvs)
-{
-       p2p_sd_response(wpa_s->global->p2p, freq, dst, dialog_token,
-                       resp_tlvs);
-}
-
-
-void wpas_p2p_sd_service_update(struct wpa_supplicant *wpa_s)
-{
-       p2p_sd_service_update(wpa_s->global->p2p);
-}
-
-
-static void wpas_p2p_srv_bonjour_free(struct p2p_srv_bonjour *bsrv)
-{
-       dl_list_del(&bsrv->list);
-       wpabuf_free(bsrv->query);
-       wpabuf_free(bsrv->resp);
-       os_free(bsrv);
-}
-
-
-static void wpas_p2p_srv_upnp_free(struct p2p_srv_upnp *usrv)
-{
-       dl_list_del(&usrv->list);
-       os_free(usrv->service);
-       os_free(usrv);
-}
-
-
-void wpas_p2p_service_flush(struct wpa_supplicant *wpa_s)
-{
-       struct p2p_srv_bonjour *bsrv, *bn;
-       struct p2p_srv_upnp *usrv, *un;
-
-       dl_list_for_each_safe(bsrv, bn, &wpa_s->global->p2p_srv_bonjour,
-                             struct p2p_srv_bonjour, list)
-               wpas_p2p_srv_bonjour_free(bsrv);
-
-       dl_list_for_each_safe(usrv, un, &wpa_s->global->p2p_srv_upnp,
-                             struct p2p_srv_upnp, list)
-               wpas_p2p_srv_upnp_free(usrv);
-
-       wpas_p2p_sd_service_update(wpa_s);
-}
-
-
-int wpas_p2p_service_add_bonjour(struct wpa_supplicant *wpa_s,
-                                struct wpabuf *query, struct wpabuf *resp)
-{
-       struct p2p_srv_bonjour *bsrv;
-
-       bsrv = wpas_p2p_service_get_bonjour(wpa_s, query);
-       if (bsrv) {
-               wpabuf_free(query);
-               wpabuf_free(bsrv->resp);
-               bsrv->resp = resp;
-               return 0;
-       }
-
-       bsrv = os_zalloc(sizeof(*bsrv));
-       if (bsrv == NULL)
-               return -1;
-       bsrv->query = query;
-       bsrv->resp = resp;
-       dl_list_add(&wpa_s->global->p2p_srv_bonjour, &bsrv->list);
-
-       wpas_p2p_sd_service_update(wpa_s);
-       return 0;
-}
-
-
-int wpas_p2p_service_del_bonjour(struct wpa_supplicant *wpa_s,
-                                const struct wpabuf *query)
-{
-       struct p2p_srv_bonjour *bsrv;
-
-       bsrv = wpas_p2p_service_get_bonjour(wpa_s, query);
-       if (bsrv == NULL)
-               return -1;
-       wpas_p2p_srv_bonjour_free(bsrv);
-       wpas_p2p_sd_service_update(wpa_s);
-       return 0;
-}
-
-
-int wpas_p2p_service_add_upnp(struct wpa_supplicant *wpa_s, u8 version,
-                             const char *service)
-{
-       struct p2p_srv_upnp *usrv;
-
-       if (wpas_p2p_service_get_upnp(wpa_s, version, service))
-               return 0; /* Already listed */
-       usrv = os_zalloc(sizeof(*usrv));
-       if (usrv == NULL)
-               return -1;
-       usrv->version = version;
-       usrv->service = os_strdup(service);
-       if (usrv->service == NULL) {
-               os_free(usrv);
-               return -1;
-       }
-       dl_list_add(&wpa_s->global->p2p_srv_upnp, &usrv->list);
-
-       wpas_p2p_sd_service_update(wpa_s);
-       return 0;
-}
-
-
-int wpas_p2p_service_del_upnp(struct wpa_supplicant *wpa_s, u8 version,
-                             const char *service)
-{
-       struct p2p_srv_upnp *usrv;
-
-       usrv = wpas_p2p_service_get_upnp(wpa_s, version, service);
-       if (usrv == NULL)
-               return -1;
-       wpas_p2p_srv_upnp_free(usrv);
-       wpas_p2p_sd_service_update(wpa_s);
-       return 0;
-}
-
-
-static void wpas_prov_disc_local_display(struct wpa_supplicant *wpa_s,
-                                        const u8 *peer, const char *params)
-{
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_SHOW_PIN MACSTR " %08d%s",
-               MAC2STR(peer), wps_generate_pin(), params);
-}
-
-
-static void wpas_prov_disc_local_keypad(struct wpa_supplicant *wpa_s,
-                                       const u8 *peer, const char *params)
-{
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_ENTER_PIN MACSTR "%s",
-               MAC2STR(peer), params);
-}
-
-
-void wpas_prov_disc_req(void *ctx, const u8 *peer, u16 config_methods,
-                       const u8 *dev_addr, const u8 *pri_dev_type,
-                       const char *dev_name, u16 supp_config_methods,
-                       u8 dev_capab, u8 group_capab)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       char devtype[WPS_DEV_TYPE_BUFSIZE];
-       char params[200];
-       u8 empty_dev_type[8];
-
-       if (pri_dev_type == NULL) {
-               os_memset(empty_dev_type, 0, sizeof(empty_dev_type));
-               pri_dev_type = empty_dev_type;
-       }
-       os_snprintf(params, sizeof(params), " p2p_dev_addr=" MACSTR
-                   " pri_dev_type=%s name='%s' config_methods=0x%x "
-                   "dev_capab=0x%x group_capab=0x%x",
-                   MAC2STR(dev_addr),
-                   wps_dev_type_bin2str(pri_dev_type, devtype,
-                                        sizeof(devtype)),
-                   dev_name, supp_config_methods, dev_capab, group_capab);
-       params[sizeof(params) - 1] = '\0';
-
-       if (config_methods & WPS_CONFIG_DISPLAY)
-               wpas_prov_disc_local_display(wpa_s, peer, params);
-       else if (config_methods & WPS_CONFIG_KEYPAD)
-               wpas_prov_disc_local_keypad(wpa_s, peer, params);
-       else if (config_methods & WPS_CONFIG_PUSHBUTTON)
-               wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_REQ MACSTR
-                       "%s", MAC2STR(peer), params);
-}
-
-
-void wpas_prov_disc_resp(void *ctx, const u8 *peer, u16 config_methods)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       if (config_methods & WPS_CONFIG_DISPLAY)
-               wpas_prov_disc_local_keypad(wpa_s, peer, "");
-       else if (config_methods & WPS_CONFIG_KEYPAD)
-               wpas_prov_disc_local_display(wpa_s, peer, "");
-       else if (config_methods & WPS_CONFIG_PUSHBUTTON)
-               wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_PROV_DISC_PBC_RESP MACSTR,
-                       MAC2STR(peer));
-
-       if (wpa_s->pending_pd_before_join &&
-           (os_memcmp(peer, wpa_s->pending_join_dev_addr, ETH_ALEN) == 0 ||
-            os_memcmp(peer, wpa_s->pending_join_iface_addr, ETH_ALEN) == 0)) {
-               wpa_s->pending_pd_before_join = 0;
-               wpa_printf(MSG_DEBUG, "P2P: Starting pending "
-                          "join-existing-group operation");
-               wpas_p2p_join_start(wpa_s);
-       }
-}
-
-
-static u8 wpas_invitation_process(void *ctx, const u8 *sa, const u8 *bssid,
-                                 const u8 *go_dev_addr, const u8 *ssid,
-                                 size_t ssid_len, int *go, u8 *group_bssid,
-                                 int *force_freq, int persistent_group)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       struct wpa_ssid *s;
-       u8 cur_bssid[ETH_ALEN];
-       int res;
-
-       if (!persistent_group) {
-               wpa_printf(MSG_DEBUG, "P2P: Invitation from " MACSTR
-                          " to join an active group", MAC2STR(sa));
-               if (!is_zero_ether_addr(wpa_s->p2p_auth_invite) &&
-                   (os_memcmp(go_dev_addr, wpa_s->p2p_auth_invite, ETH_ALEN)
-                    == 0 ||
-                    os_memcmp(sa, wpa_s->p2p_auth_invite, ETH_ALEN) == 0)) {
-                       wpa_printf(MSG_DEBUG, "P2P: Accept previously "
-                                  "authorized invitation");
-                       goto accept_inv;
-               }
-               /*
-                * Do not accept the invitation automatically; notify user and
-                * request approval.
-                */
-               return P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE;
-       }
-
-       if (!wpa_s->conf->persistent_reconnect)
-               return P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE;
-
-       for (s = wpa_s->conf->ssid; s; s = s->next) {
-               if (s->disabled == 2 &&
-                   os_memcmp(s->bssid, go_dev_addr, ETH_ALEN) == 0 &&
-                   s->ssid_len == ssid_len &&
-                   os_memcmp(ssid, s->ssid, ssid_len) == 0)
-                       break;
-       }
-
-       if (!s) {
-               wpa_printf(MSG_DEBUG, "P2P: Invitation from " MACSTR
-                          " requested reinvocation of an unknown group",
-                          MAC2STR(sa));
-               return P2P_SC_FAIL_UNKNOWN_GROUP;
-       }
-
-       if (s->mode == WPAS_MODE_P2P_GO && !wpas_p2p_create_iface(wpa_s)) {
-               *go = 1;
-               if (wpa_s->wpa_state >= WPA_AUTHENTICATING) {
-                       wpa_printf(MSG_DEBUG, "P2P: The only available "
-                                  "interface is already in use - reject "
-                                  "invitation");
-                       return P2P_SC_FAIL_UNABLE_TO_ACCOMMODATE;
-               }
-               os_memcpy(group_bssid, wpa_s->own_addr, ETH_ALEN);
-       } else if (s->mode == WPAS_MODE_P2P_GO) {
-               *go = 1;
-               if (wpas_p2p_add_group_interface(wpa_s, WPA_IF_P2P_GO) < 0)
-               {
-                       wpa_printf(MSG_ERROR, "P2P: Failed to allocate a new "
-                                  "interface address for the group");
-                       return P2P_SC_FAIL_UNABLE_TO_ACCOMMODATE;
-               }
-               os_memcpy(group_bssid, wpa_s->pending_interface_addr,
-                         ETH_ALEN);
-       }
-
-accept_inv:
-       if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, cur_bssid) == 0 &&
-           wpa_s->assoc_freq) {
-               wpa_printf(MSG_DEBUG, "P2P: Trying to force channel to match "
-                          "the channel we are already using");
-               *force_freq = wpa_s->assoc_freq;
-       }
-
-       res = wpa_drv_shared_freq(wpa_s);
-       if (res > 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Trying to force channel to match "
-                          "with the channel we are already using on a "
-                          "shared interface");
-               *force_freq = res;
-       }
-
-       return P2P_SC_SUCCESS;
-}
-
-
-static void wpas_invitation_received(void *ctx, const u8 *sa, const u8 *bssid,
-                                    const u8 *ssid, size_t ssid_len,
-                                    const u8 *go_dev_addr, u8 status,
-                                    int op_freq)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       struct wpa_ssid *s;
-
-       for (s = wpa_s->conf->ssid; s; s = s->next) {
-               if (s->disabled == 2 &&
-                   s->ssid_len == ssid_len &&
-                   os_memcmp(ssid, s->ssid, ssid_len) == 0)
-                       break;
-       }
-
-       if (status == P2P_SC_SUCCESS) {
-               wpa_printf(MSG_DEBUG, "P2P: Invitation from peer " MACSTR
-                          " was accepted; op_freq=%d MHz",
-                          MAC2STR(sa), op_freq);
-               if (s) {
-                       wpas_p2p_group_add_persistent(
-                               wpa_s, s, s->mode == WPAS_MODE_P2P_GO, 0);
-               } else if (bssid) {
-                       wpas_p2p_join(wpa_s, bssid, go_dev_addr,
-                                     wpa_s->p2p_wps_method);
-               }
-               return;
-       }
-
-       if (status != P2P_SC_FAIL_INFO_CURRENTLY_UNAVAILABLE) {
-               wpa_printf(MSG_DEBUG, "P2P: Invitation from peer " MACSTR
-                          " was rejected (status %u)", MAC2STR(sa), status);
-               return;
-       }
-
-       if (!s) {
-               if (bssid) {
-                       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RECEIVED
-                               "sa=" MACSTR " go_dev_addr=" MACSTR
-                               " bssid=" MACSTR " unknown-network",
-                               MAC2STR(sa), MAC2STR(go_dev_addr),
-                               MAC2STR(bssid));
-               } else {
-                       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RECEIVED
-                               "sa=" MACSTR " go_dev_addr=" MACSTR
-                               " unknown-network",
-                               MAC2STR(sa), MAC2STR(go_dev_addr));
-               }
-               return;
-       }
-
-       wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RECEIVED "sa=" MACSTR
-               " persistent=%d", MAC2STR(sa), s->id);
-}
-
-
-static void wpas_invitation_result(void *ctx, int status, const u8 *bssid)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       struct wpa_ssid *ssid;
-
-       if (bssid) {
-               wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RESULT
-                       "status=%d " MACSTR,
-                       status, MAC2STR(bssid));
-       } else {
-               wpa_msg(wpa_s, MSG_INFO, P2P_EVENT_INVITATION_RESULT
-                       "status=%d ", status);
-       }
-
-       if (wpa_s->pending_invite_ssid_id == -1)
-               return; /* Invitation to active group */
-
-       if (status != P2P_SC_SUCCESS) {
-               wpas_p2p_remove_pending_group_interface(wpa_s);
-               return;
-       }
-
-       ssid = wpa_config_get_network(wpa_s->conf,
-                                     wpa_s->pending_invite_ssid_id);
-       if (ssid == NULL) {
-               wpa_printf(MSG_ERROR, "P2P: Could not find persistent group "
-                          "data matching with invitation");
-               return;
-       }
-
-       wpas_p2p_group_add_persistent(wpa_s, ssid,
-                                     ssid->mode == WPAS_MODE_P2P_GO, 0);
-}
-
-
-static int wpas_p2p_default_channels(struct wpa_supplicant *wpa_s,
-                                    struct p2p_channels *chan)
-{
-       int i, cla = 0;
-
-       wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for 2.4 GHz "
-                  "band");
-
-       /* Operating class 81 - 2.4 GHz band channels 1..13 */
-       chan->reg_class[cla].reg_class = 81;
-       chan->reg_class[cla].channels = 11;
-       for (i = 0; i < 11; i++)
-               chan->reg_class[cla].channel[i] = i + 1;
-       cla++;
-
-       wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for lower 5 GHz "
-                  "band");
-
-       /* Operating class 115 - 5 GHz, channels 36-48 */
-       chan->reg_class[cla].reg_class = 115;
-       chan->reg_class[cla].channels = 4;
-       chan->reg_class[cla].channel[0] = 36;
-       chan->reg_class[cla].channel[1] = 40;
-       chan->reg_class[cla].channel[2] = 44;
-       chan->reg_class[cla].channel[3] = 48;
-       cla++;
-
-       wpa_printf(MSG_DEBUG, "P2P: Enable operating classes for higher 5 GHz "
-                  "band");
-
-       /* Operating class 124 - 5 GHz, channels 149,153,157,161 */
-       chan->reg_class[cla].reg_class = 124;
-       chan->reg_class[cla].channels = 4;
-       chan->reg_class[cla].channel[0] = 149;
-       chan->reg_class[cla].channel[1] = 153;
-       chan->reg_class[cla].channel[2] = 157;
-       chan->reg_class[cla].channel[3] = 161;
-       cla++;
-
-       chan->reg_classes = cla;
-       return 0;
-}
-
-
-static struct hostapd_hw_modes * get_mode(struct hostapd_hw_modes *modes,
-                                         u16 num_modes,
-                                         enum hostapd_hw_mode mode)
-{
-       u16 i;
-
-       for (i = 0; i < num_modes; i++) {
-               if (modes[i].mode == mode)
-                       return &modes[i];
-       }
-
-       return NULL;
-}
-
-
-static int has_channel(struct hostapd_hw_modes *mode, u8 chan)
-{
-       int i;
-
-       for (i = 0; i < mode->num_channels; i++) {
-               if (mode->channels[i].chan == chan) {
-                       return !(mode->channels[i].flag &
-                                (HOSTAPD_CHAN_DISABLED |
-                                 HOSTAPD_CHAN_PASSIVE_SCAN |
-                                 HOSTAPD_CHAN_NO_IBSS |
-                                 HOSTAPD_CHAN_RADAR));
-               }
-       }
-
-       return 0;
-}
-
-
-struct p2p_oper_class_map {
-       enum hostapd_hw_mode mode;
-       u8 op_class;
-       u8 min_chan;
-       u8 max_chan;
-       u8 inc;
-};
-
-static int wpas_p2p_setup_channels(struct wpa_supplicant *wpa_s,
-                                  struct p2p_channels *chan)
-{
-       struct hostapd_hw_modes *modes, *mode;
-       u16 num_modes, flags;
-       int cla, op;
-       struct p2p_oper_class_map op_class[] = {
-               { HOSTAPD_MODE_IEEE80211G, 81, 1, 13, 1 },
-               { HOSTAPD_MODE_IEEE80211G, 82, 14, 14, 1 },
-               { HOSTAPD_MODE_IEEE80211A, 115, 36, 48, 4 },
-               { HOSTAPD_MODE_IEEE80211A, 124, 149, 161, 4 },
-#if 0 /* TODO: 40 MHz channels */
-               { HOSTAPD_MODE_IEEE80211G, 83, 1, 9, 1 },
-               { HOSTAPD_MODE_IEEE80211G, 84, 5, 13, 1 },
-               { HOSTAPD_MODE_IEEE80211A, 116, 36, 44, 8 },
-               { HOSTAPD_MODE_IEEE80211A, 117, 40, 48, 8 },
-               { HOSTAPD_MODE_IEEE80211A, 126, 149, 157, 8 },
-               { HOSTAPD_MODE_IEEE80211A, 127, 153, 161, 8 },
-#endif
-               { -1, 0, 0, 0, 0 }
-       };
-
-       modes = wpa_drv_get_hw_feature_data(wpa_s, &num_modes, &flags);
-       if (modes == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Driver did not support fetching "
-                          "of all supported channels; assume dualband "
-                          "support");
-               return wpas_p2p_default_channels(wpa_s, chan);
-       }
-
-       cla = 0;
-
-       for (op = 0; op_class[op].op_class; op++) {
-               struct p2p_oper_class_map *o = &op_class[op];
-               u8 ch;
-               struct p2p_reg_class *reg = NULL;
-
-               mode = get_mode(modes, num_modes, o->mode);
-               if (mode == NULL)
-                       continue;
-               for (ch = o->min_chan; ch <= o->max_chan; ch += o->inc) {
-                       if (!has_channel(mode, ch))
-                               continue;
-                       if (reg == NULL) {
-                               wpa_printf(MSG_DEBUG, "P2P: Add operating "
-                                          "class %u", o->op_class);
-                               reg = &chan->reg_class[cla];
-                               cla++;
-                               reg->reg_class = o->op_class;
-                       }
-                       reg->channel[reg->channels] = ch;
-                       reg->channels++;
-               }
-               if (reg) {
-                       wpa_hexdump(MSG_DEBUG, "P2P: Channels",
-                                   reg->channel, reg->channels);
-               }
-       }
-
-       chan->reg_classes = cla;
-
-       ieee80211_sta_free_hw_features(modes, num_modes);
-
-       return 0;
-}
-
-
-static int wpas_get_noa(void *ctx, const u8 *interface_addr, u8 *buf,
-                       size_t buf_len)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-
-       for (wpa_s = wpa_s->global->ifaces; wpa_s; wpa_s = wpa_s->next) {
-               if (os_memcmp(wpa_s->own_addr, interface_addr, ETH_ALEN) == 0)
-                       break;
-       }
-       if (wpa_s == NULL)
-               return -1;
-
-       return wpa_drv_get_noa(wpa_s, buf, buf_len);
-}
-
-
-/**
- * wpas_p2p_init - Initialize P2P module for %wpa_supplicant
- * @global: Pointer to global data from wpa_supplicant_init()
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * Returns: 0 on success, -1 on failure
- */
-int wpas_p2p_init(struct wpa_global *global, struct wpa_supplicant *wpa_s)
-{
-       struct p2p_config p2p;
-       unsigned int r;
-       int i;
-
-       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
-               return 0;
-
-#ifdef CONFIG_CLIENT_MLME
-       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_MGMT)) {
-               wpa_s->mlme.public_action_cb = p2p_rx_action_mlme;
-               wpa_s->mlme.public_action_cb_ctx = wpa_s;
-       }
-#endif /* CONFIG_CLIENT_MLME */
-
-       if (wpa_drv_disable_11b_rates(wpa_s, 1) < 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to disable 11b rates");
-               /* Continue anyway; this is not really a fatal error */
-       }
-
-       if (global->p2p)
-               return 0;
-
-       os_memset(&p2p, 0, sizeof(p2p));
-       p2p.msg_ctx = wpa_s;
-       p2p.cb_ctx = wpa_s;
-       p2p.p2p_scan = wpas_p2p_scan;
-       p2p.send_action = wpas_send_action;
-       p2p.send_action_done = wpas_send_action_done;
-       p2p.go_neg_completed = wpas_go_neg_completed;
-       p2p.go_neg_req_rx = wpas_go_neg_req_rx;
-       p2p.dev_found = wpas_dev_found;
-       p2p.start_listen = wpas_start_listen;
-       p2p.stop_listen = wpas_stop_listen;
-       p2p.send_probe_resp = wpas_send_probe_resp;
-       p2p.sd_request = wpas_sd_request;
-       p2p.sd_response = wpas_sd_response;
-       p2p.prov_disc_req = wpas_prov_disc_req;
-       p2p.prov_disc_resp = wpas_prov_disc_resp;
-       p2p.invitation_process = wpas_invitation_process;
-       p2p.invitation_received = wpas_invitation_received;
-       p2p.invitation_result = wpas_invitation_result;
-       p2p.get_noa = wpas_get_noa;
-
-       os_memcpy(wpa_s->global->p2p_dev_addr, wpa_s->own_addr, ETH_ALEN);
-       os_memcpy(p2p.dev_addr, wpa_s->own_addr, ETH_ALEN);
-       p2p.dev_name = wpa_s->conf->device_name;
-
-       if (wpa_s->conf->p2p_listen_reg_class &&
-           wpa_s->conf->p2p_listen_channel) {
-               p2p.reg_class = wpa_s->conf->p2p_listen_reg_class;
-               p2p.channel = wpa_s->conf->p2p_listen_channel;
-       } else {
-               p2p.reg_class = 81;
-               /*
-                * Pick one of the social channels randomly as the listen
-                * channel.
-                */
-               os_get_random((u8 *) &r, sizeof(r));
-               p2p.channel = 1 + (r % 3) * 5;
-       }
-
-       if (wpa_s->conf->p2p_oper_reg_class &&
-           wpa_s->conf->p2p_oper_channel) {
-               p2p.op_reg_class = wpa_s->conf->p2p_oper_reg_class;
-               p2p.op_channel = wpa_s->conf->p2p_oper_channel;
-       } else {
-               p2p.op_reg_class = 81;
-               /*
-                * For initial tests, pick the operation channel randomly.
-                * TODO: Use scan results (etc.) to select the best channel.
-                */
-               p2p.op_channel = 1 + r % 11;
-       }
-       wpa_printf(MSG_DEBUG, "P2P: Own listen channel: %d  "
-                  "Own preferred operation channel: %d",
-                  p2p.channel, p2p.op_channel);
-       if (wpa_s->conf->country[0] && wpa_s->conf->country[1]) {
-               os_memcpy(p2p.country, wpa_s->conf->country, 2);
-               p2p.country[2] = 0x04;
-       } else
-               os_memcpy(p2p.country, "US\x04", 3);
-
-       if (wpas_p2p_setup_channels(wpa_s, &p2p.channels)) {
-               wpa_printf(MSG_ERROR, "P2P: Failed to configure supported "
-                          "channel list");
-               return -1;
-       }
-
-       if (wpa_s->conf->device_type &&
-           wps_dev_type_str2bin(wpa_s->conf->device_type, p2p.pri_dev_type) <
-           0) {
-               wpa_printf(MSG_ERROR, "P2P: Invalid device_type");
-               return -1;
-       }
-
-       for (i = 0; i < MAX_SEC_DEVICE_TYPES; i++) {
-               if (wpa_s->conf->sec_device_type[i] == NULL)
-                       continue;
-               if (wps_dev_type_str2bin(
-                           wpa_s->conf->sec_device_type[i],
-                           p2p.sec_dev_type[p2p.num_sec_dev_types]) < 0) {
-                       wpa_printf(MSG_ERROR, "P2P: Invalid sec_device_type");
-                       return -1;
-               }
-               p2p.num_sec_dev_types++;
-               if (p2p.num_sec_dev_types == P2P_SEC_DEVICE_TYPES)
-                       break;
-       }
-
-       p2p.concurrent_operations = !!(wpa_s->drv_flags &
-                                      WPA_DRIVER_FLAGS_P2P_CONCURRENT);
-
-       p2p.max_peers = wpa_s->max_stations ? wpa_s->max_stations : 100;
-
-       if (wpa_s->conf->p2p_ssid_postfix) {
-               p2p.ssid_postfix_len =
-                       os_strlen(wpa_s->conf->p2p_ssid_postfix);
-               if (p2p.ssid_postfix_len > sizeof(p2p.ssid_postfix))
-                       p2p.ssid_postfix_len = sizeof(p2p.ssid_postfix);
-               os_memcpy(p2p.ssid_postfix, wpa_s->conf->p2p_ssid_postfix,
-                         p2p.ssid_postfix_len);
-       }
-
-       p2p.p2p_intra_bss = wpa_s->conf->p2p_intra_bss;
-
-       global->p2p = p2p_init(&p2p);
-       if (global->p2p == NULL)
-               return -1;
-
-       return 0;
-}
-
-
-/**
- * wpas_p2p_deinit - Deinitialize per-interface P2P data
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- *
- * This function deinitialize per-interface P2P data.
- */
-void wpas_p2p_deinit(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver && wpa_s->drv_priv)
-               wpa_drv_probe_req_report(wpa_s, 0);
-       os_free(wpa_s->go_params);
-       wpa_s->go_params = NULL;
-       wpabuf_free(wpa_s->pending_action_tx);
-       wpa_s->pending_action_tx = NULL;
-       eloop_cancel_timeout(wpas_send_action_cb, wpa_s, NULL);
-       eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
-       eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
-       wpa_s->p2p_long_listen = 0;
-       eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
-       wpas_p2p_remove_pending_group_interface(wpa_s);
-
-       /* TODO: remove group interface from the driver if this wpa_s instance
-        * is on top of a P2P group interface */
-}
-
-
-/**
- * wpas_p2p_deinit_global - Deinitialize global P2P module
- * @global: Pointer to global data from wpa_supplicant_init()
- *
- * This function deinitializes the global (per device) P2P module.
- */
-void wpas_p2p_deinit_global(struct wpa_global *global)
-{
-       struct wpa_supplicant *wpa_s, *tmp;
-       char *ifname;
-
-       if (global->p2p == NULL)
-               return;
-
-       /* Remove remaining P2P group interfaces */
-       wpa_s = global->ifaces;
-       if (wpa_s)
-               wpas_p2p_service_flush(wpa_s);
-       while (wpa_s && wpa_s->p2p_group_interface != NOT_P2P_GROUP_INTERFACE)
-               wpa_s = wpa_s->next;
-       while (wpa_s) {
-               enum wpa_driver_if_type type;
-               tmp = global->ifaces;
-               while (tmp &&
-                      (tmp == wpa_s ||
-                       tmp->p2p_group_interface == NOT_P2P_GROUP_INTERFACE)) {
-                       tmp = tmp->next;
-               }
-               if (tmp == NULL)
-                       break;
-               ifname = os_strdup(tmp->ifname);
-               type = wpas_p2p_if_type(tmp->p2p_group_interface);
-               wpa_supplicant_remove_iface(global, tmp);
-               if (ifname)
-                       wpa_drv_if_remove(wpa_s, type, ifname);
-               os_free(ifname);
-       }
-
-       /*
-        * Deinit GO data on any possibly remaining interface (if main
-        * interface is used as GO).
-        */
-       for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
-               if (wpa_s->ap_iface)
-                       wpas_p2p_group_deinit(wpa_s);
-       }
-
-       p2p_deinit(global->p2p);
-       global->p2p = NULL;
-}
-
-
-static int wpas_p2p_create_iface(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE)
-               return 1; /* P2P group requires a new interface in every case
-                          */
-       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CONCURRENT))
-               return 0; /* driver does not support concurrent operations */
-       if (wpa_s->global->ifaces->next)
-               return 1; /* more that one interface already in use */
-       if (wpa_s->wpa_state >= WPA_AUTHENTICATING)
-               return 1; /* this interface is already in use */
-       return 0;
-}
-
-
-static int wpas_p2p_start_go_neg(struct wpa_supplicant *wpa_s,
-                                const u8 *peer_addr,
-                                enum p2p_wps_method wps_method,
-                                int go_intent, const u8 *own_interface_addr,
-                                unsigned int force_freq, int persistent_group)
-{
-       return p2p_connect(wpa_s->global->p2p, peer_addr, wps_method,
-                          go_intent, own_interface_addr, force_freq,
-                          persistent_group);
-}
-
-
-static int wpas_p2p_auth_go_neg(struct wpa_supplicant *wpa_s,
-                               const u8 *peer_addr,
-                               enum p2p_wps_method wps_method,
-                               int go_intent, const u8 *own_interface_addr,
-                               unsigned int force_freq, int persistent_group)
-{
-       return p2p_authorize(wpa_s->global->p2p, peer_addr, wps_method,
-                            go_intent, own_interface_addr, force_freq,
-                            persistent_group);
-}
-
-
-static void wpas_p2p_scan_res_join(struct wpa_supplicant *wpa_s,
-                                  struct wpa_scan_results *scan_res)
-{
-       struct wpa_bss *bss;
-       int freq;
-
-       eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
-
-       if (wpa_s->global->p2p_disabled)
-               return;
-
-       wpa_printf(MSG_DEBUG, "P2P: Scan results received (%d BSS) for join",
-                  scan_res ? (int) scan_res->num : -1);
-
-       if (scan_res)
-               wpas_p2p_scan_res_handler(wpa_s, scan_res);
-
-       freq = p2p_get_oper_freq(wpa_s->global->p2p,
-                                wpa_s->pending_join_iface_addr);
-       if (freq >= 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Target GO operating frequency "
-                          "from P2P peer table: %d MHz", freq);
-       }
-       bss = wpa_bss_get_bssid(wpa_s, wpa_s->pending_join_iface_addr);
-       if (bss) {
-               freq = bss->freq;
-               wpa_printf(MSG_DEBUG, "P2P: Target GO operating frequency "
-                          "from BSS table: %d MHz", freq);
-       }
-       if (freq > 0) {
-               u16 method;
-
-               wpa_printf(MSG_DEBUG, "P2P: Send Provision Discovery Request "
-                          "prior to joining an existing group (GO " MACSTR
-                          " freq=%u MHz)",
-                          MAC2STR(wpa_s->pending_join_dev_addr), freq);
-               wpa_s->pending_pd_before_join = 1;
-
-               switch (wpa_s->pending_join_wps_method) {
-               case WPS_PIN_LABEL:
-               case WPS_PIN_DISPLAY:
-                       method = WPS_CONFIG_KEYPAD;
-                       break;
-               case WPS_PIN_KEYPAD:
-                       method = WPS_CONFIG_DISPLAY;
-                       break;
-               case WPS_PBC:
-                       method = WPS_CONFIG_PUSHBUTTON;
-                       break;
-               default:
-                       method = 0;
-                       break;
-               }
-
-               if (p2p_prov_disc_req(wpa_s->global->p2p,
-                                     wpa_s->pending_join_dev_addr, method, 1)
-                   < 0) {
-                       wpa_printf(MSG_DEBUG, "P2P: Failed to send Provision "
-                                  "Discovery Request before joining an "
-                                  "existing group");
-                       wpa_s->pending_pd_before_join = 0;
-                       goto start;
-               }
-
-               /*
-                * Actual join operation will be started from the Action frame
-                * TX status callback.
-                */
-               return;
-       }
-
-       wpa_printf(MSG_DEBUG, "P2P: Target BSS/GO not yet in BSS table - "
-                  "cannot send Provision Discovery Request");
-
-start:
-       /* Start join operation immediately */
-       wpas_p2p_join_start(wpa_s);
-}
-
-
-static void wpas_p2p_join_scan(void *eloop_ctx, void *timeout_ctx)
-{
-       struct wpa_supplicant *wpa_s = eloop_ctx;
-       int ret;
-       struct wpa_driver_scan_params params;
-       struct wpabuf *wps_ie, *ies;
-
-       os_memset(&params, 0, sizeof(params));
-
-       /* P2P Wildcard SSID */
-       params.num_ssids = 1;
-       params.ssids[0].ssid = (u8 *) P2P_WILDCARD_SSID;
-       params.ssids[0].ssid_len = P2P_WILDCARD_SSID_LEN;
-
-       wpa_s->wps->dev.p2p = 1;
-       wps_ie = wps_build_probe_req_ie(0, &wpa_s->wps->dev, wpa_s->wps->uuid,
-                                       WPS_REQ_ENROLLEE);
-       if (wps_ie == NULL) {
-               wpas_p2p_scan_res_join(wpa_s, NULL);
-               return;
-       }
-
-       ies = wpabuf_alloc(wpabuf_len(wps_ie) + 100);
-       if (ies == NULL) {
-               wpabuf_free(wps_ie);
-               wpas_p2p_scan_res_join(wpa_s, NULL);
-               return;
-       }
-       wpabuf_put_buf(ies, wps_ie);
-       wpabuf_free(wps_ie);
-
-       p2p_scan_ie(wpa_s->global->p2p, ies);
-
-       params.extra_ies = wpabuf_head(ies);
-       params.extra_ies_len = wpabuf_len(ies);
-
-       /*
-        * Run a scan to update BSS table and start Provision Discovery once
-        * the new scan results become available.
-        */
-       wpa_s->scan_res_handler = wpas_p2p_scan_res_join;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_USER_SPACE_MLME)
-               ret = ieee80211_sta_req_scan(wpa_s, &params);
-       else
-               ret = wpa_drv_scan(wpa_s, &params);
-
-       wpabuf_free(ies);
-
-       if (ret) {
-               wpa_printf(MSG_DEBUG, "P2P: Failed to start scan for join - "
-                          "try again later");
-               eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
-               eloop_register_timeout(1, 0, wpas_p2p_join_scan, wpa_s, NULL);
-       }
-}
-
-
-static int wpas_p2p_join(struct wpa_supplicant *wpa_s, const u8 *iface_addr,
-                        const u8 *dev_addr, enum p2p_wps_method wps_method)
-{
-       wpa_printf(MSG_DEBUG, "P2P: Request to join existing group (iface "
-                  MACSTR " dev " MACSTR ")",
-                  MAC2STR(iface_addr), MAC2STR(dev_addr));
-
-       os_memcpy(wpa_s->pending_join_iface_addr, iface_addr, ETH_ALEN);
-       os_memcpy(wpa_s->pending_join_dev_addr, dev_addr, ETH_ALEN);
-       wpa_s->pending_join_wps_method = wps_method;
-
-       /* Make sure we are not running find during connection establishment */
-       wpas_p2p_stop_find(wpa_s);
-
-       wpas_p2p_join_scan(wpa_s, NULL);
-       return 0;
-}
-
-
-static int wpas_p2p_join_start(struct wpa_supplicant *wpa_s)
-{
-       struct wpa_supplicant *group;
-       struct p2p_go_neg_results res;
-
-       group = wpas_p2p_get_group_iface(wpa_s, 0, 0);
-       if (group == NULL)
-               return -1;
-       if (group != wpa_s) {
-               os_memcpy(group->p2p_pin, wpa_s->p2p_pin,
-                         sizeof(group->p2p_pin));
-               group->p2p_wps_method = wpa_s->p2p_wps_method;
-       }
-
-       group->p2p_in_provisioning = 1;
-
-       os_memset(&res, 0, sizeof(res));
-       os_memcpy(res.peer_interface_addr, wpa_s->pending_join_iface_addr,
-                 ETH_ALEN);
-       res.wps_method = wpa_s->pending_join_wps_method;
-       wpas_start_wps_enrollee(group, &res);
-
-       /*
-        * Allow a longer timeout for join-a-running-group than normal 15
-        * second group formation timeout since the GO may not have authorized
-        * our connection yet.
-        */
-       eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s, NULL);
-       eloop_register_timeout(60, 0, wpas_p2p_group_formation_timeout,
-                              wpa_s, NULL);
-
-       return 0;
-}
-
-
-/**
- * wpas_p2p_connect - Request P2P Group Formation to be started
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * @peer_addr: Address of the peer P2P Device
- * @pin: PIN to use during provisioning or %NULL to indicate PBC mode
- * @persistent_group: Whether to create a persistent group
- * @join: Whether to join an existing group (as a client) instead of starting
- *     Group Owner negotiation; @peer_addr is BSSID in that case
- * @auth: Whether to only authorize the connection instead of doing that and
- *     initiating Group Owner negotiation
- * @go_intent: GO Intent or -1 to use default
- * @freq: Frequency for the group or 0 for auto-selection
- * Returns: 0 or new PIN (if pin was %NULL) on success, -1 on unspecified
- *     failure, -2 on failure due to channel not currently available,
- *     -3 if forced channel is not supported
- */
-int wpas_p2p_connect(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
-                    const char *pin, enum p2p_wps_method wps_method,
-                    int persistent_group, int join, int auth, int go_intent,
-                    int freq)
-{
-       int force_freq = 0, oper_freq = 0;
-       u8 bssid[ETH_ALEN];
-       int ret = 0;
-       enum wpa_driver_if_type iftype;
-
-       if (go_intent < 0)
-               go_intent = wpa_s->conf->p2p_go_intent;
-
-       if (!auth)
-               wpa_s->p2p_long_listen = 0;
-
-       wpa_s->p2p_wps_method = wps_method;
-
-       if (pin)
-               os_strlcpy(wpa_s->p2p_pin, pin, sizeof(wpa_s->p2p_pin));
-       else if (wps_method == WPS_PIN_DISPLAY) {
-               ret = wps_generate_pin();
-               os_snprintf(wpa_s->p2p_pin, sizeof(wpa_s->p2p_pin), "%08d",
-                           ret);
-               wpa_printf(MSG_DEBUG, "P2P: Randomly generated PIN: %s",
-                          wpa_s->p2p_pin);
-       } else
-               wpa_s->p2p_pin[0] = '\0';
-
-       if (join) {
-               u8 iface_addr[ETH_ALEN], dev_addr[ETH_ALEN];
-               if (auth) {
-                       wpa_printf(MSG_DEBUG, "P2P: Authorize invitation to "
-                                  "connect a running group from " MACSTR,
-                                  MAC2STR(peer_addr));
-                       os_memcpy(wpa_s->p2p_auth_invite, peer_addr, ETH_ALEN);
-                       return ret;
-               }
-               os_memcpy(dev_addr, peer_addr, ETH_ALEN);
-               if (p2p_get_interface_addr(wpa_s->global->p2p, peer_addr,
-                                          iface_addr) < 0) {
-                       os_memcpy(iface_addr, peer_addr, ETH_ALEN);
-                       p2p_get_dev_addr(wpa_s->global->p2p, peer_addr,
-                                        dev_addr);
-               }
-               if (wpas_p2p_join(wpa_s, iface_addr, dev_addr, wps_method) <
-                   0)
-                       return -1;
-               return ret;
-       }
-
-       if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, bssid) == 0 &&
-           wpa_s->assoc_freq)
-               oper_freq = wpa_s->assoc_freq;
-       else {
-               oper_freq = wpa_drv_shared_freq(wpa_s);
-               if (oper_freq < 0)
-                       oper_freq = 0;
-       }
-
-       if (freq > 0) {
-               if (!p2p_supported_freq(wpa_s->global->p2p, freq)) {
-                       wpa_printf(MSG_DEBUG, "P2P: The forced channel "
-                                  "(%u MHz) is not supported for P2P uses",
-                                  freq);
-                       return -3;
-               }
-
-               if (oper_freq > 0 && freq != oper_freq &&
-                   !(wpa_s->drv_flags &
-                     WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT)) {
-                       wpa_printf(MSG_DEBUG, "P2P: Cannot start P2P group "
-                                  "on %u MHz while connected on another "
-                                  "channel (%u MHz)", freq, oper_freq);
-                       return -2;
-               }
-               wpa_printf(MSG_DEBUG, "P2P: Trying to force us to use the "
-                          "requested channel (%u MHz)", freq);
-               force_freq = freq;
-       } else if (oper_freq > 0 &&
-                  !p2p_supported_freq(wpa_s->global->p2p, oper_freq)) {
-               if (!(wpa_s->drv_flags &
-                     WPA_DRIVER_FLAGS_MULTI_CHANNEL_CONCURRENT)) {
-                       wpa_printf(MSG_DEBUG, "P2P: Cannot start P2P group "
-                                  "while connected on non-P2P supported "
-                                  "channel (%u MHz)", oper_freq);
-                       return -2;
-               }
-               wpa_printf(MSG_DEBUG, "P2P: Current operating channel "
-                          "(%u MHz) not available for P2P - try to use "
-                          "another channel", oper_freq);
-               force_freq = 0;
-       } else if (oper_freq > 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Trying to force us to use the "
-                          "channel we are already using (%u MHz) on another "
-                          "interface", oper_freq);
-               force_freq = oper_freq;
-       }
-
-       wpa_s->create_p2p_iface = wpas_p2p_create_iface(wpa_s);
-
-       if (!wpa_s->create_p2p_iface) {
-               if (auth) {
-                       if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method,
-                                                go_intent, wpa_s->own_addr,
-                                                force_freq, persistent_group)
-                           < 0)
-                               return -1;
-                       return ret;
-               }
-               if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method,
-                                         go_intent, wpa_s->own_addr,
-                                         force_freq, persistent_group) < 0)
-                       return -1;
-               return ret;
-       }
-
-       /* Prepare to add a new interface for the group */
-       iftype = WPA_IF_P2P_GROUP;
-       if (join)
-               iftype = WPA_IF_P2P_CLIENT;
-       else if (go_intent == 15)
-               iftype = WPA_IF_P2P_GO;
-       if (wpas_p2p_add_group_interface(wpa_s, iftype) < 0) {
-               wpa_printf(MSG_ERROR, "P2P: Failed to allocate a new "
-                          "interface for the group");
-               return -1;
-       }
-
-       if (auth) {
-               if (wpas_p2p_auth_go_neg(wpa_s, peer_addr, wps_method,
-                                        go_intent,
-                                        wpa_s->pending_interface_addr,
-                                        force_freq, persistent_group) < 0)
-                       return -1;
-               return ret;
-       }
-       if (wpas_p2p_start_go_neg(wpa_s, peer_addr, wps_method, go_intent,
-                                 wpa_s->pending_interface_addr,
-                                 force_freq, persistent_group) < 0) {
-               wpas_p2p_remove_pending_group_interface(wpa_s);
-               return -1;
-       }
-       return ret;
-}
-
-
-/**
- * wpas_p2p_remain_on_channel_cb - Indication of remain-on-channel start
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * @freq: Frequency of the channel in MHz
- * @duration: Duration of the stay on the channel in milliseconds
- *
- * This callback is called when the driver indicates that it has started the
- * requested remain-on-channel duration.
- */
-void wpas_p2p_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
-                                  unsigned int freq, unsigned int duration)
-{
-       wpa_s->roc_waiting_drv_freq = 0;
-       wpa_s->off_channel_freq = freq;
-       wpas_send_action_cb(wpa_s, NULL);
-       if (wpa_s->off_channel_freq == wpa_s->pending_listen_freq) {
-               p2p_listen_cb(wpa_s->global->p2p, wpa_s->pending_listen_freq,
-                             wpa_s->pending_listen_duration);
-               wpa_s->pending_listen_freq = 0;
-       }
-}
-
-
-static int wpas_p2p_listen_start(struct wpa_supplicant *wpa_s,
-                                unsigned int timeout)
-{
-       /* Limit maximum Listen state time based on driver limitation. */
-       if (timeout > wpa_s->max_remain_on_chan)
-               timeout = wpa_s->max_remain_on_chan;
-
-       return p2p_listen(wpa_s->global->p2p, timeout);
-}
-
-
-/**
- * wpas_p2p_cancel_remain_on_channel_cb - Remain-on-channel timeout
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * @freq: Frequency of the channel in MHz
- *
- * This callback is called when the driver indicates that a remain-on-channel
- * operation has been completed, i.e., the duration on the requested channel
- * has timed out.
- */
-void wpas_p2p_cancel_remain_on_channel_cb(struct wpa_supplicant *wpa_s,
-                                         unsigned int freq)
-{
-       wpa_printf(MSG_DEBUG, "P2P: Cancel remain-on-channel callback "
-                  "(p2p_long_listen=%d pending_action_tx=%p)",
-                  wpa_s->p2p_long_listen, wpa_s->pending_action_tx);
-       wpa_s->off_channel_freq = 0;
-       if (p2p_listen_end(wpa_s->global->p2p, freq) > 0)
-               return; /* P2P module started a new operation */
-       if (wpa_s->pending_action_tx)
-               return;
-       if (wpa_s->p2p_long_listen > 0)
-               wpa_s->p2p_long_listen -= 5;
-       if (wpa_s->p2p_long_listen > 0) {
-               wpa_printf(MSG_DEBUG, "P2P: Continuing long Listen state");
-               wpas_p2p_listen_start(wpa_s, wpa_s->p2p_long_listen * 1000);
-       }
-}
-
-
-/**
- * wpas_p2p_group_remove - Remove a P2P group
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * @ifname: Network interface name of the group interface or "*" to remove all
- *     groups
- * Returns: 0 on success, -1 on failure
- *
- * This function is used to remove a P2P group. This can be used to disconnect
- * from a group in which the local end is a P2P Client or to end a P2P Group in
- * case the local end is the Group Owner. If a virtual network interface was
- * created for this group, that interface will be removed. Otherwise, only the
- * configured P2P group network will be removed from the interface.
- */
-int wpas_p2p_group_remove(struct wpa_supplicant *wpa_s, const char *ifname)
-{
-       struct wpa_global *global = wpa_s->global;
-
-       if (os_strcmp(ifname, "*") == 0) {
-               struct wpa_supplicant *prev;
-               wpa_s = global->ifaces;
-               while (wpa_s) {
-                       prev = wpa_s;
-                       wpa_s = wpa_s->next;
-                       wpas_p2p_group_delete(prev);
-               }
-               return 0;
-       }
-
-       for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
-               if (os_strcmp(wpa_s->ifname, ifname) == 0)
-                       break;
-       }
-
-       if (wpa_s == NULL)
-               return -1;
-
-       wpas_p2p_group_delete(wpa_s);
-
-       return 0;
-}
-
-
-static void wpas_p2p_init_go_params(struct wpa_supplicant *wpa_s,
-                                   struct p2p_go_neg_results *params,
-                                   int freq)
-{
-       u8 bssid[ETH_ALEN];
-       int res;
-
-       os_memset(params, 0, sizeof(*params));
-       params->role_go = 1;
-       params->freq = 2412;
-       if (freq)
-               params->freq = freq;
-       else if (wpa_s->conf->p2p_oper_reg_class == 81 &&
-                wpa_s->conf->p2p_oper_channel >= 1 &&
-                wpa_s->conf->p2p_oper_channel <= 11)
-               params->freq = 2407 + 5 * wpa_s->conf->p2p_oper_channel;
-       else if (wpa_s->conf->p2p_oper_reg_class == 115 ||
-                wpa_s->conf->p2p_oper_reg_class == 118)
-               params->freq = 5000 + 5 * wpa_s->conf->p2p_oper_channel;
-       if (wpa_s->current_ssid && wpa_drv_get_bssid(wpa_s, bssid) == 0 &&
-           wpa_s->assoc_freq && !freq) {
-               wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we are "
-                          "already using");
-               params->freq = wpa_s->assoc_freq;
-       }
-
-       res = wpa_drv_shared_freq(wpa_s);
-       if (res > 0 && !freq) {
-               wpa_printf(MSG_DEBUG, "P2P: Force GO on the channel we are "
-                          "already using on a shared interface");
-               params->freq = res;
-       }
-}
-
-
-static struct wpa_supplicant *
-wpas_p2p_get_group_iface(struct wpa_supplicant *wpa_s, int addr_allocated,
-                        int go)
-{
-       struct wpa_supplicant *group_wpa_s;
-
-       if (!wpas_p2p_create_iface(wpa_s))
-               return wpa_s;
-
-       if (wpas_p2p_add_group_interface(wpa_s, go ? WPA_IF_P2P_GO :
-                                        WPA_IF_P2P_CLIENT) < 0)
-               return NULL;
-       group_wpa_s = wpas_p2p_init_group_interface(wpa_s, go);
-       if (group_wpa_s == NULL) {
-               wpas_p2p_remove_pending_group_interface(wpa_s);
-               return NULL;
-       }
-
-       return group_wpa_s;
-}
-
-
-/**
- * wpas_p2p_group_add - Add a new P2P group with local end as Group Owner
- * @wpa_s: Pointer to wpa_supplicant data from wpa_supplicant_add_iface()
- * @persistent_group: Whether to create a persistent group
- * @freq: Frequency for the group or 0 to indicate no hardcoding
- * Returns: 0 on success, -1 on failure
- *
- * This function creates a new P2P group with the local end as the Group Owner,
- * i.e., without using Group Owner Negotiation.
- */
-int wpas_p2p_group_add(struct wpa_supplicant *wpa_s, int persistent_group,
-                      int freq)
-{
-       struct p2p_go_neg_results params;
-
-       if (freq > 0 && !p2p_supported_freq(wpa_s->global->p2p, freq)) {
-               wpa_printf(MSG_DEBUG, "P2P: The forced channel for GO "
-                          "(%u MHz) is not supported for P2P uses",
-                          freq);
-               return -1;
-       }
-
-       wpas_p2p_init_go_params(wpa_s, &params, freq);
-       p2p_go_params(wpa_s->global->p2p, &params);
-       params.persistent_group = persistent_group;
-
-       wpa_s = wpas_p2p_get_group_iface(wpa_s, 0, 1);
-       if (wpa_s == NULL)
-               return -1;
-       wpas_start_wps_go(wpa_s, &params, 0);
-
-       return 0;
-}
-
-
-static int wpas_start_p2p_client(struct wpa_supplicant *wpa_s,
-                                struct wpa_ssid *params, int addr_allocated)
-{
-       struct wpa_ssid *ssid;
-
-       wpa_s = wpas_p2p_get_group_iface(wpa_s, addr_allocated, 0);
-       if (wpa_s == NULL)
-               return -1;
-
-       wpa_supplicant_ap_deinit(wpa_s);
-
-       ssid = wpa_config_add_network(wpa_s->conf);
-       if (ssid == NULL)
-               return -1;
-       wpas_notify_network_added(wpa_s, ssid);
-       wpa_config_set_network_defaults(ssid);
-       ssid->temporary = 1;
-       ssid->proto = WPA_PROTO_RSN;
-       ssid->pairwise_cipher = WPA_CIPHER_CCMP;
-       ssid->group_cipher = WPA_CIPHER_CCMP;
-       ssid->key_mgmt = WPA_KEY_MGMT_PSK;
-       ssid->ssid = os_malloc(params->ssid_len);
-       if (ssid->ssid == NULL) {
-               wpas_notify_network_removed(wpa_s, ssid);
-               wpa_config_remove_network(wpa_s->conf, ssid->id);
-               return -1;
-       }
-       os_memcpy(ssid->ssid, params->ssid, params->ssid_len);
-       ssid->ssid_len = params->ssid_len;
-       ssid->p2p_group = 1;
-       if (params->psk_set) {
-               os_memcpy(ssid->psk, params->psk, 32);
-               ssid->psk_set = 1;
-       }
-       if (params->passphrase)
-               ssid->passphrase = os_strdup(params->passphrase);
-
-       wpa_supplicant_select_network(wpa_s, ssid);
-
-       wpa_s->show_group_started = 1;
-
-       return 0;
-}
-
-
-int wpas_p2p_group_add_persistent(struct wpa_supplicant *wpa_s,
-                                 struct wpa_ssid *ssid, int addr_allocated,
-                                 int freq)
-{
-       struct p2p_go_neg_results params;
-
-       if (ssid->disabled != 2 || ssid->ssid == NULL)
-               return -1;
-
-       wpa_s->p2p_long_listen = 0;
-       eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
-
-       if (ssid->mode == WPAS_MODE_INFRA)
-               return wpas_start_p2p_client(wpa_s, ssid, addr_allocated);
-
-       if (ssid->mode != WPAS_MODE_P2P_GO)
-               return -1;
-
-       wpas_p2p_init_go_params(wpa_s, &params, freq);
-
-       params.role_go = 1;
-       if (ssid->passphrase == NULL ||
-           os_strlen(ssid->passphrase) >= sizeof(params.passphrase)) {
-               wpa_printf(MSG_DEBUG, "P2P: Invalid passphrase in persistent "
-                          "group");
-               return -1;
-       }
-       os_strlcpy(params.passphrase, ssid->passphrase,
-                  sizeof(params.passphrase));
-       os_memcpy(params.ssid, ssid->ssid, ssid->ssid_len);
-       params.ssid_len = ssid->ssid_len;
-       params.persistent_group = 1;
-
-       wpa_s = wpas_p2p_get_group_iface(wpa_s, addr_allocated, 1);
-       if (wpa_s == NULL)
-               return -1;
-
-       wpas_start_wps_go(wpa_s, &params, 0);
-
-       return 0;
-}
-
-
-static void wpas_p2p_ie_update(void *ctx, struct wpabuf *beacon_ies,
-                              struct wpabuf *proberesp_ies)
-{
-       struct wpa_supplicant *wpa_s = ctx;
-       if (wpa_s->ap_iface) {
-               struct hostapd_data *hapd = wpa_s->ap_iface->bss[0];
-               if (beacon_ies) {
-                       wpabuf_free(hapd->p2p_beacon_ie);
-                       hapd->p2p_beacon_ie = beacon_ies;
-               }
-               wpabuf_free(hapd->p2p_probe_resp_ie);
-               hapd->p2p_probe_resp_ie = proberesp_ies;
-       } else {
-               wpabuf_free(beacon_ies);
-               wpabuf_free(proberesp_ies);
-       }
-       wpa_supplicant_ap_update_beacon(wpa_s);
-}
-
-
-struct p2p_group * wpas_p2p_group_init(struct wpa_supplicant *wpa_s,
-                                      int persistent_group,
-                                      int group_formation)
-{
-       struct p2p_group *group;
-       struct p2p_group_config *cfg;
-
-       cfg = os_zalloc(sizeof(*cfg));
-       if (cfg == NULL)
-               return NULL;
-
-       cfg->persistent_group = persistent_group;
-       os_memcpy(cfg->interface_addr, wpa_s->own_addr, ETH_ALEN);
-       cfg->cb_ctx = wpa_s;
-       cfg->ie_update = wpas_p2p_ie_update;
-
-       group = p2p_group_init(wpa_s->global->p2p, cfg);
-       if (group == NULL)
-               os_free(cfg);
-       if (!group_formation)
-               p2p_group_notif_formation_done(group);
-       wpa_s->p2p_group = group;
-       return group;
-}
-
-
-void wpas_p2p_wps_success(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
-                         int registrar)
-{
-       if (!wpa_s->p2p_in_provisioning) {
-               wpa_printf(MSG_DEBUG, "P2P: Ignore WPS success event - P2P "
-                          "provisioning not in progress");
-               return;
-       }
-
-       eloop_cancel_timeout(wpas_p2p_group_formation_timeout, wpa_s->parent,
-                            NULL);
-       if (wpa_s->global->p2p)
-               p2p_wps_success_cb(wpa_s->global->p2p, peer_addr);
-       wpas_group_formation_completed(wpa_s, 1);
-}
-
-
-int wpas_p2p_prov_disc(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
-                      const char *config_method)
-{
-       u16 config_methods;
-
-       if (os_strcmp(config_method, "display") == 0)
-               config_methods = WPS_CONFIG_DISPLAY;
-       else if (os_strcmp(config_method, "keypad") == 0)
-               config_methods = WPS_CONFIG_KEYPAD;
-       else if (os_strcmp(config_method, "pbc") == 0 ||
-                os_strcmp(config_method, "pushbutton") == 0)
-               config_methods = WPS_CONFIG_PUSHBUTTON;
-       else
-               return -1;
-
-       if (wpa_s->global->p2p == NULL)
-               return -1;
-
-       return p2p_prov_disc_req(wpa_s->global->p2p, peer_addr,
-                                config_methods, 0);
-}
-
-
-int wpas_p2p_scan_result_text(const u8 *ies, size_t ies_len, char *buf,
-                             char *end)
-{
-       return p2p_scan_result_text(ies, ies_len, buf, end);
-}
-
-
-static void wpas_p2p_clear_pending_action_tx(struct wpa_supplicant *wpa_s)
-{
-       if (!wpa_s->pending_action_tx)
-               return;
-
-       wpa_printf(MSG_DEBUG, "P2P: Drop pending Action TX due to new "
-                  "operation request");
-       wpabuf_free(wpa_s->pending_action_tx);
-       wpa_s->pending_action_tx = NULL;
-}
-
-
-int wpas_p2p_find(struct wpa_supplicant *wpa_s, unsigned int timeout,
-                 enum p2p_discovery_type type)
-{
-       wpas_p2p_clear_pending_action_tx(wpa_s);
-       wpa_s->p2p_long_listen = 0;
-
-       return p2p_find(wpa_s->global->p2p, timeout, type);
-}
-
-
-void wpas_p2p_stop_find(struct wpa_supplicant *wpa_s)
-{
-       wpas_p2p_clear_pending_action_tx(wpa_s);
-       wpa_s->p2p_long_listen = 0;
-       eloop_cancel_timeout(wpas_p2p_join_scan, wpa_s, NULL);
-
-       p2p_stop_find(wpa_s->global->p2p);
-
-       wpas_p2p_remove_pending_group_interface(wpa_s);
-}
-
-
-static void wpas_p2p_long_listen_timeout(void *eloop_ctx, void *timeout_ctx)
-{
-       struct wpa_supplicant *wpa_s = eloop_ctx;
-       wpa_s->p2p_long_listen = 0;
-}
-
-
-int wpas_p2p_listen(struct wpa_supplicant *wpa_s, unsigned int timeout)
-{
-       int res;
-
-       wpas_p2p_clear_pending_action_tx(wpa_s);
-
-       if (timeout == 0) {
-               /*
-                * This is a request for unlimited Listen state. However, at
-                * least for now, this is mapped to a Listen state for one
-                * hour.
-                */
-               timeout = 3600;
-       }
-       eloop_cancel_timeout(wpas_p2p_long_listen_timeout, wpa_s, NULL);
-       wpa_s->p2p_long_listen = 0;
-
-       res = wpas_p2p_listen_start(wpa_s, timeout * 1000);
-       if (res == 0 && timeout * 1000 > wpa_s->max_remain_on_chan) {
-               wpa_s->p2p_long_listen = timeout;
-               eloop_register_timeout(timeout, 0,
-                                      wpas_p2p_long_listen_timeout,
-                                      wpa_s, NULL);
-       }
-
-       return res;
-}
-
-
-int wpas_p2p_assoc_req_ie(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
-                         u8 *buf, size_t len, int p2p_group)
-{
-       struct wpabuf *p2p_ie;
-       int ret;
-
-       if (wpa_s->global->p2p_disabled)
-               return -1;
-       if (wpa_s->global->p2p == NULL)
-               return -1;
-       if (bss == NULL)
-               return -1;
-
-       p2p_ie = wpa_bss_get_vendor_ie_multi(bss, P2P_IE_VENDOR_TYPE);
-       ret = p2p_assoc_req_ie(wpa_s->global->p2p, bss->bssid, buf, len,
-                              p2p_group, p2p_ie);
-       wpabuf_free(p2p_ie);
-
-       return ret;
-}
-
-
-int wpas_p2p_probe_req_rx(struct wpa_supplicant *wpa_s, const u8 *addr,
-                         const u8 *ie, size_t ie_len)
-{
-       if (wpa_s->global->p2p_disabled)
-               return 0;
-       if (wpa_s->global->p2p == NULL)
-               return 0;
-
-       return p2p_probe_req_rx(wpa_s->global->p2p, addr, ie, ie_len);
-}
-
-
-void wpas_p2p_rx_action(struct wpa_supplicant *wpa_s, const u8 *da,
-                       const u8 *sa, const u8 *bssid,
-                       u8 category, const u8 *data, size_t len, int freq)
-{
-       if (wpa_s->global->p2p_disabled)
-               return;
-       if (wpa_s->global->p2p == NULL)
-               return;
-
-       p2p_rx_action(wpa_s->global->p2p, da, sa, bssid, category, data, len,
-                     freq);
-}
-
-
-void wpas_p2p_scan_ie(struct wpa_supplicant *wpa_s, struct wpabuf *ies)
-{
-       if (wpa_s->global->p2p_disabled)
-               return;
-       if (wpa_s->global->p2p == NULL)
-               return;
-
-       p2p_scan_ie(wpa_s->global->p2p, ies);
-}
-
-
-void wpas_p2p_group_deinit(struct wpa_supplicant *wpa_s)
-{
-       p2p_group_deinit(wpa_s->p2p_group);
-       wpa_s->p2p_group = NULL;
-}
-
-
-int wpas_p2p_reject(struct wpa_supplicant *wpa_s, const u8 *addr)
-{
-       wpa_s->p2p_long_listen = 0;
-
-       return p2p_reject(wpa_s->global->p2p, addr);
-}
-
-
-/* Invite to reinvoke a persistent group */
-int wpas_p2p_invite(struct wpa_supplicant *wpa_s, const u8 *peer_addr,
-                   struct wpa_ssid *ssid, const u8 *go_dev_addr)
-{
-       enum p2p_invite_role role;
-       u8 *bssid = NULL;
-
-       if (ssid->mode == WPAS_MODE_P2P_GO) {
-               role = P2P_INVITE_ROLE_GO;
-               if (peer_addr == NULL) {
-                       wpa_printf(MSG_DEBUG, "P2P: Missing peer "
-                                  "address in invitation command");
-                       return -1;
-               }
-               if (wpas_p2p_create_iface(wpa_s)) {
-                       if (wpas_p2p_add_group_interface(wpa_s,
-                                                        WPA_IF_P2P_GO) < 0) {
-                               wpa_printf(MSG_ERROR, "P2P: Failed to "
-                                          "allocate a new interface for the "
-                                          "group");
-                               return -1;
-                       }
-                       bssid = wpa_s->pending_interface_addr;
-               } else
-                       bssid = wpa_s->own_addr;
-       } else {
-               role = P2P_INVITE_ROLE_CLIENT;
-               peer_addr = ssid->bssid;
-       }
-       wpa_s->pending_invite_ssid_id = ssid->id;
-
-       return p2p_invite(wpa_s->global->p2p, peer_addr, role, bssid,
-                         ssid->ssid, ssid->ssid_len, 0, go_dev_addr, 1);
-}
-
-
-/* Invite to join an active group */
-int wpas_p2p_invite_group(struct wpa_supplicant *wpa_s, const char *ifname,
-                         const u8 *peer_addr, const u8 *go_dev_addr)
-{
-       struct wpa_global *global = wpa_s->global;
-       enum p2p_invite_role role;
-       u8 *bssid = NULL;
-       struct wpa_ssid *ssid;
-
-       for (wpa_s = global->ifaces; wpa_s; wpa_s = wpa_s->next) {
-               if (os_strcmp(wpa_s->ifname, ifname) == 0)
-                       break;
-       }
-       if (wpa_s == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: Interface '%s' not found", ifname);
-               return -1;
-       }
-
-       ssid = wpa_s->current_ssid;
-       if (ssid == NULL) {
-               wpa_printf(MSG_DEBUG, "P2P: No current SSID to use for "
-                          "invitation");
-               return -1;
-       }
-
-       if (ssid->mode == WPAS_MODE_P2P_GO) {
-               role = P2P_INVITE_ROLE_ACTIVE_GO;
-               bssid = wpa_s->own_addr;
-               if (go_dev_addr == NULL)
-                       go_dev_addr = wpa_s->parent->own_addr;
-       } else {
-               role = P2P_INVITE_ROLE_CLIENT;
-               if (wpa_s->wpa_state < WPA_ASSOCIATED) {
-                       wpa_printf(MSG_DEBUG, "P2P: Not associated - cannot "
-                                  "invite to current group");
-                       return -1;
-               }
-               bssid = wpa_s->bssid;
-               if (go_dev_addr == NULL &&
-                   !is_zero_ether_addr(wpa_s->go_dev_addr))
-                       go_dev_addr = wpa_s->go_dev_addr;
-       }
-       wpa_s->pending_invite_ssid_id = -1;
-
-       return p2p_invite(wpa_s->global->p2p, peer_addr, role, bssid,
-                         ssid->ssid, ssid->ssid_len, wpa_s->assoc_freq,
-                         go_dev_addr, 0);
-}
-
-
-void wpas_p2p_completed(struct wpa_supplicant *wpa_s)
-{
-       struct wpa_ssid *ssid = wpa_s->current_ssid;
-       const char *ssid_txt;
-       u8 go_dev_addr[ETH_ALEN];
-       int persistent;
-
-       if (!wpa_s->show_group_started || !ssid)
-               return;
-
-       wpa_s->show_group_started = 0;
-
-       ssid_txt = wpa_ssid_txt(ssid->ssid, ssid->ssid_len);
-       os_memset(go_dev_addr, 0, ETH_ALEN);
-       if (ssid->bssid_set)
-               os_memcpy(go_dev_addr, ssid->bssid, ETH_ALEN);
-       persistent = wpas_p2p_persistent_group(wpa_s, go_dev_addr, ssid->ssid,
-                                              ssid->ssid_len);
-       os_memcpy(wpa_s->go_dev_addr, go_dev_addr, ETH_ALEN);
-
-       if (ssid->passphrase == NULL && ssid->psk_set) {
-               char psk[65];
-               wpa_snprintf_hex(psk, sizeof(psk), ssid->psk, 32);
-               wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
-                       "%s client ssid=\"%s\" freq=%d psk=%s go_dev_addr="
-                       MACSTR "%s",
-                       wpa_s->ifname, ssid_txt, ssid->frequency, psk,
-                       MAC2STR(go_dev_addr),
-                       persistent ? " [PERSISTENT]" : "");
-       } else {
-               wpa_msg(wpa_s->parent, MSG_INFO, P2P_EVENT_GROUP_STARTED
-                       "%s client ssid=\"%s\" freq=%d passphrase=\"%s\" "
-                       "go_dev_addr=" MACSTR "%s",
-                       wpa_s->ifname, ssid_txt, ssid->frequency,
-                       ssid->passphrase ? ssid->passphrase : "",
-                       MAC2STR(go_dev_addr),
-                       persistent ? " [PERSISTENT]" : "");
-       }
-
-       if (persistent)
-               wpas_p2p_store_persistent_group(wpa_s->parent, ssid,
-                                               go_dev_addr);
-}
-
-
-int wpas_p2p_presence_req(struct wpa_supplicant *wpa_s, u32 duration1,
-                         u32 interval1, u32 duration2, u32 interval2)
-{
-       if (wpa_s->wpa_state < WPA_ASSOCIATED ||
-           wpa_s->current_ssid == NULL ||
-           wpa_s->current_ssid->mode != WPAS_MODE_INFRA)
-               return -1;
-
-       return p2p_presence_req(wpa_s->global->p2p, wpa_s->bssid,
-                               wpa_s->own_addr, wpa_s->assoc_freq,
-                               duration1, interval1, duration2, interval2);
-}
-
-
-int wpas_p2p_ext_listen(struct wpa_supplicant *wpa_s, unsigned int period,
-                       unsigned int interval)
-{
-       return p2p_ext_listen(wpa_s->global->p2p, period, interval);
-}
-
-
-void wpas_p2p_deauth_notif(struct wpa_supplicant *wpa_s, const u8 *bssid,
-                          u16 reason_code, const u8 *ie, size_t ie_len)
-{
-       if (wpa_s->global->p2p_disabled)
-               return;
-
-       p2p_deauth_notif(wpa_s->global->p2p, bssid, reason_code, ie, ie_len);
-}
-
-
-void wpas_p2p_disassoc_notif(struct wpa_supplicant *wpa_s, const u8 *bssid,
-                            u16 reason_code, const u8 *ie, size_t ie_len)
-{
-       if (wpa_s->global->p2p_disabled)
-               return;
-
-       p2p_disassoc_notif(wpa_s->global->p2p, bssid, reason_code, ie, ie_len);
-}
-
-
-void wpas_p2p_update_config(struct wpa_supplicant *wpa_s)
-{
-       struct p2p_data *p2p = wpa_s->global->p2p;
-
-       if (p2p == NULL)
-               return;
-
-       if (!(wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE))
-               return;
-
-       if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_NAME)
-               p2p_set_dev_name(p2p, wpa_s->conf->device_name);
-
-       if (wpa_s->conf->changed_parameters & CFG_CHANGED_DEVICE_TYPE) {
-               u8 pri_dev_type[8];
-               if (wpa_s->conf->device_type) {
-                       if (wps_dev_type_str2bin(wpa_s->conf->device_type,
-                                                pri_dev_type) < 0) {
-                               wpa_printf(MSG_ERROR, "P2P: Invalid "
-                                          "device_type");
-                       } else
-                               p2p_set_pri_dev_type(p2p, pri_dev_type);
-               }
-       }
-
-       if (wpa_s->conf->changed_parameters & CFG_CHANGED_SEC_DEVICE_TYPE) {
-               u8 sec_dev_type[P2P_SEC_DEVICE_TYPES][8];
-               size_t num = 0;
-               int i;
-               for (i = 0; i < MAX_SEC_DEVICE_TYPES; i++) {
-                       if (wpa_s->conf->sec_device_type[i] == NULL)
-                               continue;
-                       if (wps_dev_type_str2bin(
-                                   wpa_s->conf->sec_device_type[i],
-                                   sec_dev_type[num]) < 0) {
-                               wpa_printf(MSG_ERROR, "P2P: Invalid "
-                                          "sec_device_type");
-                               continue;
-                       }
-                       num++;
-                       if (num == P2P_SEC_DEVICE_TYPES)
-                               break;
-               }
-               p2p_set_sec_dev_types(p2p, (void *) sec_dev_type, num);
-       }
-
-       if ((wpa_s->conf->changed_parameters & CFG_CHANGED_COUNTRY) &&
-           wpa_s->conf->country[0] && wpa_s->conf->country[1]) {
-               char country[3];
-               country[0] = wpa_s->conf->country[0];
-               country[1] = wpa_s->conf->country[1];
-               country[2] = 0x04;
-               p2p_set_country(p2p, country);
-       }
-
-       if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_SSID_POSTFIX) {
-               p2p_set_ssid_postfix(p2p, (u8 *) wpa_s->conf->p2p_ssid_postfix,
-                                    wpa_s->conf->p2p_ssid_postfix ?
-                                    os_strlen(wpa_s->conf->p2p_ssid_postfix) :
-                                    0);
-       }
-
-       if (wpa_s->conf->changed_parameters & CFG_CHANGED_P2P_INTRA_BSS)
-               p2p_set_intra_bss_dist(p2p, wpa_s->conf->p2p_intra_bss);
-}
-
-
-int wpas_p2p_set_noa(struct wpa_supplicant *wpa_s, u8 count, int start,
-                    int duration)
-{
-       if (!wpa_s->ap_iface)
-               return -1;
-       return hostapd_p2p_set_noa(wpa_s->ap_iface->bss[0], count, start,
-                                  duration);
-}
-
-
-int wpas_p2p_set_cross_connect(struct wpa_supplicant *wpa_s, int enabled)
-{
-       if (wpa_s->global->p2p_disabled)
-               return -1;
-       if (wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_MGMT)
-               return -1;
-
-       wpa_s->global->cross_connection = enabled;
-       p2p_set_cross_connect(wpa_s->global->p2p, enabled);
-
-       if (!enabled) {
-               struct wpa_supplicant *iface;
-
-               for (iface = wpa_s->global->ifaces; iface; iface = iface->next)
-               {
-                       if (iface->cross_connect_enabled == 0)
-                               continue;
-
-                       iface->cross_connect_enabled = 0;
-                       iface->cross_connect_in_use = 0;
-                       wpa_msg(iface->parent, MSG_INFO,
-                               P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
-                               iface->ifname, iface->cross_connect_uplink);
-               }
-       }
-
-       return 0;
-}
-
-
-static void wpas_p2p_enable_cross_connect(struct wpa_supplicant *uplink)
-{
-       struct wpa_supplicant *iface;
-
-       if (!uplink->global->cross_connection)
-               return;
-
-       for (iface = uplink->global->ifaces; iface; iface = iface->next) {
-               if (!iface->cross_connect_enabled)
-                       continue;
-               if (os_strcmp(uplink->ifname, iface->cross_connect_uplink) !=
-                   0)
-                       continue;
-               if (iface->ap_iface == NULL)
-                       continue;
-               if (iface->cross_connect_in_use)
-                       continue;
-
-               iface->cross_connect_in_use = 1;
-               wpa_msg(iface->parent, MSG_INFO,
-                       P2P_EVENT_CROSS_CONNECT_ENABLE "%s %s",
-                       iface->ifname, iface->cross_connect_uplink);
-       }
-}
-
-
-static void wpas_p2p_disable_cross_connect(struct wpa_supplicant *uplink)
-{
-       struct wpa_supplicant *iface;
-
-       for (iface = uplink->global->ifaces; iface; iface = iface->next) {
-               if (!iface->cross_connect_enabled)
-                       continue;
-               if (os_strcmp(uplink->ifname, iface->cross_connect_uplink) !=
-                   0)
-                       continue;
-               if (!iface->cross_connect_in_use)
-                       continue;
-
-               wpa_msg(iface->parent, MSG_INFO,
-                       P2P_EVENT_CROSS_CONNECT_DISABLE "%s %s",
-                       iface->ifname, iface->cross_connect_uplink);
-               iface->cross_connect_in_use = 0;
-       }
-}
-
-
-void wpas_p2p_notif_connected(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->ap_iface || wpa_s->current_ssid == NULL ||
-           wpa_s->current_ssid->mode != WPAS_MODE_INFRA ||
-           wpa_s->cross_connect_disallowed)
-               wpas_p2p_disable_cross_connect(wpa_s);
-       else
-               wpas_p2p_enable_cross_connect(wpa_s);
-}
-
-
-void wpas_p2p_notif_disconnected(struct wpa_supplicant *wpa_s)
-{
-       wpas_p2p_disable_cross_connect(wpa_s);
-}
-
-
-static void wpas_p2p_cross_connect_setup(struct wpa_supplicant *wpa_s)
-{
-       struct wpa_supplicant *iface;
-
-       if (!wpa_s->global->cross_connection)
-               return;
-
-       for (iface = wpa_s->global->ifaces; iface; iface = iface->next) {
-               if (iface == wpa_s)
-                       continue;
-               if (iface->drv_flags &
-                   WPA_DRIVER_FLAGS_P2P_DEDICATED_INTERFACE)
-                       continue;
-               if (iface->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE)
-                       continue;
-
-               wpa_s->cross_connect_enabled = 1;
-               os_strlcpy(wpa_s->cross_connect_uplink, iface->ifname,
-                          sizeof(wpa_s->cross_connect_uplink));
-               wpa_printf(MSG_DEBUG, "P2P: Enable cross connection from "
-                          "%s to %s whenever uplink is available",
-                          wpa_s->ifname, wpa_s->cross_connect_uplink);
-
-               if (iface->ap_iface || iface->current_ssid == NULL ||
-                   iface->current_ssid->mode != WPAS_MODE_INFRA ||
-                   iface->cross_connect_disallowed ||
-                   iface->wpa_state != WPA_COMPLETED)
-                       break;
-
-               wpa_s->cross_connect_in_use = 1;
-               wpa_msg(wpa_s->parent, MSG_INFO,
-                       P2P_EVENT_CROSS_CONNECT_ENABLE "%s %s",
-                       wpa_s->ifname, wpa_s->cross_connect_uplink);
-               break;
-       }
-}
-
-
-int wpas_p2p_notif_pbc_overlap(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->p2p_group_interface != P2P_GROUP_INTERFACE_CLIENT &&
-           !wpa_s->p2p_in_provisioning)
-               return 0; /* not P2P client operation */
-
-       wpa_printf(MSG_DEBUG, "P2P: Terminate connection due to WPS PBC "
-                  "session overlap");
-       wpas_group_formation_completed(wpa_s, 0);
-       return 1;
-}
-
-
-void wpas_p2p_update_channel_list(struct wpa_supplicant *wpa_s)
-{
-       struct p2p_channels chan;
-
-       if (wpa_s->global == NULL || wpa_s->global->p2p == NULL)
-               return;
-
-       os_memset(&chan, 0, sizeof(chan));
-       if (wpas_p2p_setup_channels(wpa_s, &chan)) {
-               wpa_printf(MSG_ERROR, "P2P: Failed to update supported "
-                          "channel list");
-               return;
-       }
-
-       p2p_update_channel_list(wpa_s->global->p2p, &chan);
-}