Merge branch 'moonshot' of ssh://moonshot.suchdamage.org:822/srv/git/libeap into...

[libeap.git] / wpa_supplicant / config.h

diff --git a/wpa_supplicant/config.h b/wpa_supplicant/config.h
index 754e4be..246c65f 100644 (file)
--- a/wpa_supplicant/config.h
+++ b/wpa_supplicant/config.h
@@ -22,11 +22,24 @@
 #define DEFAULT_AP_SCAN 1
 #endif /* CONFIG_NO_SCAN_PROCESSING */
 #define DEFAULT_FAST_REAUTH 1
+#define DEFAULT_P2P_GO_INTENT 7
+#define DEFAULT_P2P_INTRA_BSS 1
 #define DEFAULT_BSS_MAX_COUNT 200
 
 #include "config_ssid.h"
 
 
+#define CFG_CHANGED_DEVICE_NAME BIT(0)
+#define CFG_CHANGED_CONFIG_METHODS BIT(1)
+#define CFG_CHANGED_DEVICE_TYPE BIT(2)
+#define CFG_CHANGED_OS_VERSION BIT(3)
+#define CFG_CHANGED_UUID BIT(4)
+#define CFG_CHANGED_COUNTRY BIT(5)
+#define CFG_CHANGED_SEC_DEVICE_TYPE BIT(6)
+#define CFG_CHANGED_P2P_SSID_POSTFIX BIT(7)
+#define CFG_CHANGED_WPS_STRING BIT(8)
+#define CFG_CHANGED_P2P_INTRA_BSS BIT(9)
+
 /**
  * struct wpa_config - wpa_supplicant configuration data
  *
@@ -302,9 +315,12 @@ struct wpa_config {
         * config_methods - Config Methods
         *
         * This is a space-separated list of supported WPS configuration
-        * methods. For example, "label display push_button keypad".
+        * methods. For example, "label virtual_display virtual_push_button
+        * keypad".
         * Available methods: usba ethernet label display ext_nfc_token
-        * int_nfc_token nfc_interface push_button keypad.
+        * int_nfc_token nfc_interface push_button keypad
+        * virtual_display physical_display
+        * virtual_push_button physical_push_button.
         */
        char *config_methods;
 
@@ -333,6 +349,22 @@ struct wpa_config {
         */
        int wps_cred_processing;
 
+#define MAX_SEC_DEVICE_TYPES 5
+       /**
+        * sec_device_type - Secondary Device Types (P2P)
+        * See device_type for the format used with these.
+        */
+       char *sec_device_type[MAX_SEC_DEVICE_TYPES];
+
+       int p2p_listen_reg_class;
+       int p2p_listen_channel;
+       int p2p_oper_reg_class;
+       int p2p_oper_channel;
+       int p2p_go_intent;
+       char *p2p_ssid_postfix;
+       int persistent_reconnect;
+       int p2p_intra_bss;
+
        /**
         * bss_max_count - Maximum number of BSS entries to keep in memory
         */
@@ -345,6 +377,11 @@ struct wpa_config {
         *   1 = only include configured SSIDs in scan results/BSS table
         */
        int filter_ssids;
+
+       /**
+        * changed_parameters - Bitmap of changed parameters since last update
+        */
+       unsigned int changed_parameters;
 };
 
 
@@ -381,6 +418,10 @@ void wpa_config_debug_dump_networks(struct wpa_config *config);
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
 
+/* Prototypes for common functions from config.c */
+int wpa_config_process_global(struct wpa_config *config, char *pos, int line);
+
+
 /* Prototypes for backend specific functions from the selected config_*.c */
 
 /**