aboutsummaryrefslogtreecommitdiff
path: root/src/ap/hostapd.h
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2015-12-28 13:27:49 -0800
committerDmitry Shmidt <dimitrysh@google.com>2015-12-28 13:31:15 -0800
commit014a3ff83915745d57480e99b47e281a82143c79 (patch)
treebf61a3a2cfcb14e926c6f66b1f95712d09411025 /src/ap/hostapd.h
parent7d56b75791f317618c9c3ff08a4cfc36c91c9611 (diff)
downloadwpa_supplicant_8-014a3ff83915745d57480e99b47e281a82143c79.tar.gz
Cumulative patch from commit 324ade51e168f28430f4429849becd0f08d507c0 (DO NOT MERGE)
324ade5 TLS: Make tls_cert_chain_failure_event() more robust c6231b5 TLS: Remove storing of never-read value 15a6813 Remove unnecessary cleanup assignment in SHA1Final() ef3866a nl80211: Don't call linux_iface_up() for a dedicated P2P Device c2ed779 mesh: Document Mesh Peering Management element structure in more detail b2817cd mesh: Check PMKID in AMPE Action frames 6c33eed mesh: Fix PMKID to match the standard ede7770 wpa_supplicant: Do not wait for monitor on P2P Device interface 1c94570 Do not wait for monitor to attach if no control interface f98674a Clone default LIBS value to LIBS_* for other tools 7d2f674 Add "GET_CAPABILITY acs" to allow ACS build option to be detected d990971 wpa_supplicant: Enable Automatic Channel Selection support for AP mode 96bc508 Handle survey event properly in wpa_supplicant d39f796 EAP-TNC peer: Remove dead code related to fragmentation 662512e P2PS: Remove dead code abbbaa4 TNC: Print received IF-TNCCS message as debug ASCII hexdump d745f02 EAP-TNC peer: Allow fragment_size to be configured a67e7e5 RADIUS: Add EACCES to list of recognized send() errno values 5bd9be4 Fix RADIUS Called-Station-Id to not escape SSID 0764dd6 TLS client: Multi-OCSP check to cover intermediate CAs d6b536f Add ocsp=3 configuration parameter for multi-OCSP 0268383 TLS: Move variable declaration to the beginning of the block b567775 TLS client: OCSP stapling with ocsp_multi option (RFC 6961) 8ea6a27 TLS server: OCSP stapling with ocsp_multi option (RFC 6961) 5addb0d Server configuration for OCSP stapling with ocsp_multi (RFC 6961) bca0872 TLS server: OCSP stapling 9532bd2 GnuTLS: OCSP stapling on the server side 6241766 Use wpa_msg() for the "RSN: PMKID mismatch" message e161451 EAP-EKE: Merge identical error return paths 13cb0a6 EAP-EKE: Reject too long Prot() data when building a frame 0ab0de8 Document previously missing key_mgmt values Change-Id: I9ac7d0da03d8baf4542e276ab20cb56e44bfa33c Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/ap/hostapd.h')
-rw-r--r--src/ap/hostapd.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ap/hostapd.h b/src/ap/hostapd.h
index 8161a593..7b59f802 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -493,6 +493,11 @@ int hostapd_probe_req_rx(struct hostapd_data *hapd, const u8 *sa, const u8 *da,
int ssi_signal);
void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
int offset, int width, int cf1, int cf2);
+struct survey_results;
+void hostapd_event_get_survey(struct hostapd_iface *iface,
+ struct survey_results *survey_results);
+void hostapd_acs_channel_selected(struct hostapd_data *hapd,
+ struct acs_selected_channels *acs_res);
const struct hostapd_eap_user *
hostapd_get_eap_user(struct hostapd_data *hapd, const u8 *identity,