Cumulative patch from commit b2b688d18d40cd667d0faa149b4a7172166b3bd4

[android-x86/external-wpa_supplicant_8.git] / src / ap / ap_config.h

diff --git a/src/ap/ap_config.h b/src/ap/ap_config.h
index 7c9ea90..c5531fa 100644 (file)
--- a/src/ap/ap_config.h
+++ b/src/ap/ap_config.h
@@ -74,8 +74,6 @@ struct hostapd_ssid {
 #ifdef CONFIG_FULL_DYNAMIC_VLAN
        char *vlan_tagged_interface;
 #endif /* CONFIG_FULL_DYNAMIC_VLAN */
-       struct hostapd_wep_keys **dyn_vlan_keys;
-       size_t max_dyn_vlan_keys;
 };
 
 
@@ -107,6 +105,7 @@ struct hostapd_wpa_psk {
        int group;
        u8 psk[PMK_LEN];
        u8 addr[ETH_ALEN];
+       u8 p2p_dev_addr[ETH_ALEN];
 };
 
 struct hostapd_eap_user {
@@ -180,6 +179,7 @@ struct hostapd_nai_realm_data {
 struct hostapd_bss_config {
        char iface[IFNAMSIZ + 1];
        char bridge[IFNAMSIZ + 1];
+       char vlan_bridge[IFNAMSIZ + 1];
        char wds_bridge[IFNAMSIZ + 1];
 
        enum hostapd_logger_level logger_syslog_level, logger_stdout_level;
@@ -242,6 +242,7 @@ struct hostapd_bss_config {
        int num_deny_mac;
        int wds_sta;
        int isolate;
+       int start_disabled;
 
        int auth_algs; /* bitfield of allowed IEEE 802.11 authentication
                        * algorithms, WPA_AUTH_ALG_{OPEN,SHARED,LEAP} */
@@ -294,6 +295,7 @@ struct hostapd_bss_config {
        char *private_key;
        char *private_key_passwd;
        int check_crl;
+       char *ocsp_stapling_response;
        char *dh_file;
        u8 *pac_opaque_encr_key;
        u8 *eap_fast_a_id;
@@ -324,7 +326,7 @@ struct hostapd_bss_config {
        int wmm_enabled;
        int wmm_uapsd;
 
-       struct hostapd_vlan *vlan, *vlan_tail;
+       struct hostapd_vlan *vlan;
 
        macaddr bssid;
 
@@ -357,6 +359,7 @@ struct hostapd_bss_config {
        u8 *extra_cred;
        size_t extra_cred_len;
        int wps_cred_processing;
+       int force_per_enrollee_psk;
        u8 *ap_settings;
        size_t ap_settings_len;
        char *upnp_iface;
@@ -373,6 +376,7 @@ struct hostapd_bss_config {
        struct wpabuf *wps_nfc_dev_pw;
 #endif /* CONFIG_WPS */
        int pbc_in_m1;
+       char *server_id;
 
 #define P2P_ENABLED BIT(0)
 #define P2P_GROUP_OWNER BIT(1)
@@ -530,6 +534,10 @@ struct hostapd_config {
        double ignore_reassoc_probability;
        double corrupt_gtk_rekey_mic_probability;
 #endif /* CONFIG_TESTING_OPTIONS */
+
+#ifdef CONFIG_ACS
+       unsigned int acs_num_scans;
+#endif /* CONFIG_ACS */
 };
 
 
@@ -544,8 +552,10 @@ int hostapd_rate_found(int *list, int rate);
 int hostapd_wep_key_cmp(struct hostapd_wep_keys *a,
                        struct hostapd_wep_keys *b);
 const u8 * hostapd_get_psk(const struct hostapd_bss_config *conf,
-                          const u8 *addr, const u8 *prev_psk);
+                          const u8 *addr, const u8 *p2p_dev_addr,
+                          const u8 *prev_psk);
 int hostapd_setup_wpa_psk(struct hostapd_bss_config *conf);
+int hostapd_vlan_id_valid(struct hostapd_vlan *vlan, int vlan_id);
 const char * hostapd_get_vlan_id_ifname(struct hostapd_vlan *vlan,
                                        int vlan_id);
 struct hostapd_radius_attr *