83ebf55865
The Wi-Fi Alliance Multi-AP Specification v1.0 allows onboarding of a backhaul STA through WPS. To enable this, the backhaul STA needs to add a Multi-AP IE to the WFA vendor extension element in the WSC M1 message that indicates it supports the Multi-AP backhaul STA role. The Registrar (if it support Multi-AP onboarding) will respond to that with a WSC M8 message that also contains the Multi-AP IE, and that contains the credentials for the backhaul SSID (which may be different from the SSID on which WPS is performed). Introduce a new parameter to wpas_wps_start_pbc() and allow it to be set via control interface's new multi_ap=1 parameter of WPS_PBC call. multi_ap_backhaul_sta is set to 1 in the automatically created SSID. Thus, if the AP does not support Multi-AP, association will fail and WPS will be terminated. Only wps_pbc is supported. This commit adds the multi_ap argument only to the control socket interface, not to the D-Bus interface. Since WPS associates with the fronthaul BSS instead of the backhaul BSS, we should not drop association if the AP announces fronthaul-only BSS. Still, we should only do that in the specific case of WPS. Therefore, add a check to multi_ap_process_assoc_resp() to allow association with a fronthaul-only BSS if and only if key_mgmt contains WPS. Signed-off-by: Davina Lu <ylu@quantenna.com> Signed-off-by: Igor Mitsyanko <igor.mitsyanko.os@quantenna.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Daniel Golle <daniel@makrotopia.org> Cc: Marianna Carrera <marianna.carrera.so@quantenna.com>
159 lines
5.1 KiB
C
159 lines
5.1 KiB
C
/*
|
|
* wpa_supplicant / WPS integration
|
|
* Copyright (c) 2008-2012, Jouni Malinen <j@w1.fi>
|
|
*
|
|
* This software may be distributed under the terms of the BSD license.
|
|
* See README for more details.
|
|
*/
|
|
|
|
#ifndef WPS_SUPPLICANT_H
|
|
#define WPS_SUPPLICANT_H
|
|
|
|
struct wpa_scan_results;
|
|
|
|
#ifdef CONFIG_WPS
|
|
|
|
#include "wps/wps.h"
|
|
#include "wps/wps_defs.h"
|
|
|
|
struct wpa_bss;
|
|
|
|
struct wps_new_ap_settings {
|
|
const char *ssid_hex;
|
|
const char *auth;
|
|
const char *encr;
|
|
const char *key_hex;
|
|
};
|
|
|
|
int wpas_wps_init(struct wpa_supplicant *wpa_s);
|
|
void wpas_wps_deinit(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s);
|
|
enum wps_request_type wpas_wps_get_req_type(struct wpa_ssid *ssid);
|
|
int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid,
|
|
int p2p_group, int multi_ap_backhaul_sta);
|
|
int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
|
|
const char *pin, int p2p_group, u16 dev_pw_id);
|
|
void wpas_wps_pbc_overlap(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_cancel(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_start_reg(struct wpa_supplicant *wpa_s, const u8 *bssid,
|
|
const char *pin, struct wps_new_ap_settings *settings);
|
|
int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid, struct wpa_bss *bss);
|
|
int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid, struct wpa_bss *bss);
|
|
int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
|
|
struct wpa_bss *selected, struct wpa_ssid *ssid);
|
|
void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_searching(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_scan_result_text(const u8 *ies, size_t ies_len, char *pos,
|
|
char *end);
|
|
int wpas_wps_er_start(struct wpa_supplicant *wpa_s, const char *filter);
|
|
void wpas_wps_er_stop(struct wpa_supplicant *wpa_s);
|
|
int wpas_wps_er_add_pin(struct wpa_supplicant *wpa_s, const u8 *addr,
|
|
const char *uuid, const char *pin);
|
|
int wpas_wps_er_pbc(struct wpa_supplicant *wpa_s, const char *uuid);
|
|
int wpas_wps_er_learn(struct wpa_supplicant *wpa_s, const char *uuid,
|
|
const char *pin);
|
|
int wpas_wps_er_set_config(struct wpa_supplicant *wpa_s, const char *uuid,
|
|
int id);
|
|
int wpas_wps_er_config(struct wpa_supplicant *wpa_s, const char *uuid,
|
|
const char *pin, struct wps_new_ap_settings *settings);
|
|
struct wpabuf * wpas_wps_er_nfc_config_token(struct wpa_supplicant *wpa_s,
|
|
int ndef, const char *uuid);
|
|
int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s);
|
|
void wpas_wps_update_config(struct wpa_supplicant *wpa_s);
|
|
struct wpabuf * wpas_wps_nfc_config_token(struct wpa_supplicant *wpa_s,
|
|
int ndef, const char *id_str);
|
|
struct wpabuf * wpas_wps_nfc_token(struct wpa_supplicant *wpa_s, int ndef);
|
|
int wpas_wps_start_nfc(struct wpa_supplicant *wpa_s, const u8 *dev_addr,
|
|
const u8 *bssid,
|
|
const struct wpabuf *dev_pw, u16 dev_pw_id,
|
|
int p2p_group, const u8 *peer_pubkey_hash,
|
|
const u8 *ssid, size_t ssid_len, int freq);
|
|
int wpas_wps_nfc_tag_read(struct wpa_supplicant *wpa_s,
|
|
const struct wpabuf *data, int forced_freq);
|
|
struct wpabuf * wpas_wps_nfc_handover_req(struct wpa_supplicant *wpa_s,
|
|
int ndef);
|
|
struct wpabuf * wpas_wps_nfc_handover_sel(struct wpa_supplicant *wpa_s,
|
|
int ndef, int cr, const char *uuid);
|
|
int wpas_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
|
|
const struct wpabuf *req,
|
|
const struct wpabuf *sel);
|
|
int wpas_er_wps_nfc_report_handover(struct wpa_supplicant *wpa_s,
|
|
const struct wpabuf *req,
|
|
const struct wpabuf *sel);
|
|
void wpas_wps_update_ap_info(struct wpa_supplicant *wpa_s,
|
|
struct wpa_scan_results *scan_res);
|
|
void wpas_wps_notify_assoc(struct wpa_supplicant *wpa_s, const u8 *bssid);
|
|
int wpas_wps_reenable_networks_pending(struct wpa_supplicant *wpa_s);
|
|
|
|
#else /* CONFIG_WPS */
|
|
|
|
static inline int wpas_wps_init(struct wpa_supplicant *wpa_s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void wpas_wps_deinit(struct wpa_supplicant *wpa_s)
|
|
{
|
|
}
|
|
|
|
static inline int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline u8 wpas_wps_get_req_type(struct wpa_ssid *ssid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid,
|
|
struct wpa_bss *bss)
|
|
{
|
|
return -1;
|
|
}
|
|
|
|
static inline int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
|
|
struct wpa_ssid *ssid,
|
|
struct wpa_bss *bss)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
|
|
struct wpa_bss *selected,
|
|
struct wpa_ssid *ssid)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s)
|
|
{
|
|
}
|
|
|
|
static inline int wpas_wps_searching(struct wpa_supplicant *wpa_s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
static inline void wpas_wps_update_ap_info(struct wpa_supplicant *wpa_s,
|
|
struct wpa_scan_results *scan_res)
|
|
{
|
|
}
|
|
|
|
static inline void wpas_wps_notify_assoc(struct wpa_supplicant *wpa_s,
|
|
const u8 *bssid)
|
|
{
|
|
}
|
|
|
|
static inline int
|
|
wpas_wps_reenable_networks_pending(struct wpa_supplicant *wpa_s)
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
#endif /* CONFIG_WPS */
|
|
|
|
#endif /* WPS_SUPPLICANT_H */
|