DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions
hostapd/wpa_supplicant/wps_supplicant.h

121 lines
3.5 KiB
C
Raw Normal View History

WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
/*
* wpa_supplicant / WPS integration
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 12:58:15 +02:00
* Copyright (c) 2008-2009, Jouni Malinen <j@w1.fi>
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
*
* 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.
*/
#ifndef WPS_SUPPLICANT_H
#define WPS_SUPPLICANT_H
Fix compiler warnings for non-WPS build
2010-01-03 20:21:03 +01:00
struct wpa_scan_res;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
#ifdef CONFIG_WPS
Added Doxygen documentation for WPS code
2009-01-03 18:50:49 +01:00
#include "wps/wps.h"
#include "wps/wps_defs.h"
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
struct wpa_bss;
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 12:58:15 +02:00
struct wps_new_ap_settings {
const char *ssid_hex;
const char *auth;
const char *encr;
const char *key_hex;
};
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 19:32:13 +01:00
int wpas_wps_init(struct wpa_supplicant *wpa_s);
void wpas_wps_deinit(struct wpa_supplicant *wpa_s);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s);
Added Doxygen documentation for WPS code
2009-01-03 18:50:49 +01:00
enum wps_request_type wpas_wps_get_req_type(struct wpa_ssid *ssid);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 19:59:45 +01:00
int wpas_wps_start_pbc(struct wpa_supplicant *wpa_s, const u8 *bssid);
int wpas_wps_start_pin(struct wpa_supplicant *wpa_s, const u8 *bssid,
const char *pin);
WPS: Add UFD support (USBA out-of-band mechanism) This patch is only for the following use case: - Enrollee = wpa_supplicant - Registrar = hostapd internal Registrar Following UFD methods can be used: - Enrollee PIN with UFD - Registrar PIN with UFD - unencrypted credential with UFD Encrypted credentials are not supported. Enrollee side operation: wpa_cli -i ath0 wps_oob <device type> <mount point> <oob method> oob method = pin-e/pin-r/cred wpa_cli -i ath0 wps_oob ufd /mnt/ pin-r Registrar side operation: ./hostapd_cli -i ath0 wps_oob <device type> <mount point> <oob method> oob method = pin-e/pin-r/cred hostapd_cli -i ath0 wps_oob ufd /mnt/ cred
2009-02-26 20:57:38 +01:00
int wpas_wps_start_oob(struct wpa_supplicant *wpa_s, char *device_type,
WPS: Add support for NFC out-of-band mechanism The new file wps_nfc.c and ndef.c implements NFC device independent operation, wps_nfc_pn531.c implements NFC device dependent operation. This patch is only for the following use case: - Enrollee = wpa_supplicant - Registrar = hostapd internal Registrar Following NFC methods can be used: - Enrollee PIN with NFC - Registrar PIN with NFC - unencrypted credential with NFC Encrypted credentials are not supported. Enrollee side operation: Registrar side operation: Example configuration. CONFIG_WPS=y CONFIG_WPS_NFC=y CONFIG_WPS_NFC_PN531=y I used NFC device "NXP PN531". The NFC device access method is confidential, so I used outer library. Please download below files from https://www.saice-wpsnfc.bz/index.php [WPS NFC Library] WpsNfcLibrary/WpsNfc.h WpsNfcLibrary/WpsNfcType.h WpsNfcLibrary/WpsNfcVersion.h WpsNfcLibrary/linux/libnfc_mapping_pn53x.dll WpsNfcLibrary/linux/wpsnfc.dll [NFC Reader/Writer Kernel Driver] NFCKernelDriver-1.0.3/linux/kobj/sonyrw.ko <WiFi test> The hostapd/wpa_supplicant with this patch passed below tests on "Wi-Fi WPS Test Plan Version 1.6". 4.2.5 Add device using NFC Method with password token (I used SONY STA instead of NXP STA.) 4.2.6 Add device using NFC Method with configuration token 5.1.9 Add to AP using NFC Method with password token through internal registrar (I used SONY AP instead of NXP AP.) 5.1.10 Add to AP using NFC Method with configuration token through internal registrar
2009-03-06 15:16:22 +01:00
char *path, char *method, char *name);
WPS: Added wpa_supplicant ctrl_iface commands to start WPS processing New control interface commands WPS_PBC, WPS_PIN, and WPS_REG can be used to start WPS processing. These add and select the WPS network block into the configuration temporarily, i.e., there is no need to add the WPS network block manually anymore.
2008-11-29 19:59:45 +01:00
int wpas_wps_start_reg(struct wpa_supplicant *wpa_s, const u8 *bssid,
WPS: Add support for AP reconfiguration with wps_reg wpa_supplicant can now reconfigure the AP by acting as an External Registrar with the wps_reg command. Previously, this was only used to fetch the current AP settings, but now the wps_reg command has optional arguments which can be used to provide the new AP configuration. When the new parameters are set, the WPS protocol run is allowed to continue through M8 to reconfigure the AP instead of stopping at M7.
2009-09-06 12:58:15 +02:00
const char *pin, struct wps_new_ap_settings *settings);
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 12:10:58 +01:00
int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, struct wpa_scan_res *bss);
int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid, struct wpa_scan_res *bss);
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 21:06:34 +01:00
int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
Use BSS table entry instead of raw scan result for connection
2010-01-02 15:16:02 +01:00
struct wpa_bss *selected, struct wpa_ssid *ssid);
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 19:09:57 +01:00
void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s);
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +01:00
int wpas_wps_searching(struct wpa_supplicant *wpa_s);
Add parsed information from WPS IE(s) into scan results This makes it easier for external programs to show WPS information since they do not need to parse the WPS IE themselves anymore.
2009-09-11 16:14:49 +02:00
int wpas_wps_scan_result_text(const u8 *ies, size_t ies_len, char *pos,
char *end);
WPS ER: Allow AP filtering based on IP address wps_er_start command now takes an optional parameter that can be used to configure a filter to only allow UPnP SSDP messages from the specified IP address. In practice, this limits the WPS ER operations to a single AP and filters out all other devices in the network.
2010-05-27 14:23:55 +02:00
int wpas_wps_er_start(struct wpa_supplicant *wpa_s, const char *filter);
WPS: Add initial part of External Registrar functionality This is the first step in adding support for using wpa_supplicant as a WPS External Registrar to manage APs over UPnP. Only the device discovery part is implemented in this commit.
2009-11-07 11:41:01 +01:00
int wpas_wps_er_stop(struct wpa_supplicant *wpa_s);
WPS 2.0: Add support for AuthorizedMACs attribute Advertize list of authorized enrollee MAC addresses in Beacon and Probe Response frames and use these when selecting the AP. In order to provide the list, the enrollee MAC address should be specified whenever adding a new PIN. In addition, add UUID-R into SetSelectedRegistrar action to make it potentially easier for an AP to figure out which ER sent the action should there be multiple ERs using the same IP address.
2009-12-12 15:40:10 +01:00
int wpas_wps_er_add_pin(struct wpa_supplicant *wpa_s, const u8 *addr,
const char *uuid, const char *pin);
WPS ER: Add preliminary PBC support This will need some additional code in wps_er_pbc() to handle PBC mode enabling for a single AP only. For now, this can only be expected to work when the ER is connected to a single AP.
2009-11-15 17:46:03 +01:00
int wpas_wps_er_pbc(struct wpa_supplicant *wpa_s, const char *uuid);
WPS ER: Add command for fetching current AP settings
2009-11-15 21:27:06 +01:00
int wpas_wps_er_learn(struct wpa_supplicant *wpa_s, const char *uuid,
const char *pin);
WPS ER: Add command for configuring an AP wps_er_config can now be used to configure an AP. It is similar to wps_er_learn, but instead of only learning the current AP settings, it continues to send M8 with the new settings for the AP.
2010-05-27 23:01:48 +02:00
int wpas_wps_er_config(struct wpa_supplicant *wpa_s, const char *uuid,
const char *pin, struct wps_new_ap_settings *settings);
WPS ER: Delay wpa_supplicant termination to allow unsubscription Instead of forcefully deinitializing ER immediately, give it some time to complete unsubscription and call eloop_terminate() only once ER code has completed its work.
2009-12-19 22:47:54 +01:00
int wpas_wps_terminate_pending(struct wpa_supplicant *wpa_s);
WPS: Use different scan result sorting rules when doing WPS provisioning The AP configuration may change after provisioning, so it is better not to use the current security policy to prioritize results. Instead, use WPS Selected Registrar attribute as the main sorting key and use signal strength next without considering security policy or rate sets. The non-WPS provisioning case remains as-is, i.e., this change applies only when trying to find an AP for WPS provisioning.
2010-06-11 22:50:13 +02:00
int wpas_wps_in_progress(struct wpa_supplicant *wpa_s);
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
#else /* CONFIG_WPS */
WPS: Moved wps_context initialization into wps_supplicant.c The wps_context data is now managed at wpa_supplicant, not EAP-WSC. This makes wpa_supplicant design for WPS match with hostapd one and also makes it easier configure whatever parameters and callbacks are needed for WPS.
2008-11-28 19:32:13 +01:00
static inline int wpas_wps_init(struct wpa_supplicant *wpa_s)
{
return 0;
}
static inline void wpas_wps_deinit(struct wpa_supplicant *wpa_s)
{
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
static inline int wpas_wps_eapol_cb(struct wpa_supplicant *wpa_s)
{
return 0;
}
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 21:06:34 +01:00
static inline u8 wpas_wps_get_req_type(struct wpa_ssid *ssid)
{
return 0;
}
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 12:10:58 +01:00
static inline int wpas_wps_ssid_bss_match(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 21:06:34 +01:00
struct wpa_scan_res *bss)
{
return -1;
}
Allow WPS APs for PIN enrollment even without Selected Registrar Some WPS APs do not set Selected Registrar attribute to 1 properly when using an external Registrar. Allow such an AP to be selected for PIN registration after couple of scan runs that do not find APs marked with Selected Registrar = 1. This allows wpa_supplicant to iterate through all APs that advertise WPS support without delaying connection with implementations that set Selected Registrar = 1 properly.
2009-01-23 12:10:58 +01:00
static inline int wpas_wps_ssid_wildcard_ok(struct wpa_supplicant *wpa_s,
struct wpa_ssid *ssid,
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 21:06:34 +01:00
struct wpa_scan_res *bss)
{
return 0;
}
static inline int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
Fix compiler warnings for non-WPS build
2010-01-03 20:21:03 +01:00
struct wpa_bss *selected,
WPS: Added support for fragmented WPS IE in Beacon and Probe Response Fragment WPS IE if needed to fit into the IE length limits in hostapd and Reassemble WPS IE data from multiple IEs in wpa_supplicant. In addition, moved WPS code from events.c into wps_supplicant.c to clean up module interfaces.
2008-11-29 21:06:34 +01:00
struct wpa_ssid *ssid)
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
{
WPS: Set Request Type properly into WPS IE in ProbeReq/AssocReq
2008-11-29 12:38:03 +01:00
return 0;
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
}
WPS: Added control interface notification for available WPS APs Whenever new scan results include WPS AP(s) and the client is not associated, send a notification message to control interface monitors. This makes it easier for GUIs to notify the user about possible WPS availability without having to go through the scan results.
2008-12-15 19:09:57 +01:00
static inline void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s)
{
}
WPS: Added support for wildcard SSID matching in ap_scan=2 mode Change association behavior to match with ap_scan=1 when WPS is used in ap_scan=2 mode with wildcard SSID matching. In addition, allow hardcoded BSSID to be used to select AP even if selected registrar attribute is not present.
2008-12-20 21:55:02 +01:00
static inline int wpas_wps_searching(struct wpa_supplicant *wpa_s)
{
return 0;
}
WPS: Move WPS glue code from wpas_glue.c to wps_supplicant.c This cleans up the internal interface between different modules and is the first step in getting wpa_supplicant design closer to hostapd as far as WPS is concerned.
2008-11-28 18:46:22 +01:00
#endif /* CONFIG_WPS */
#endif /* WPS_SUPPLICANT_H */
Reference in a new issue Copy permalink