wifi: Scan all stored hidden networks

[platform/upstream/connman.git] / gsupplicant / gsupplicant.h

diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h
index 883de7f..da45075 100644 (file)
--- a/gsupplicant/gsupplicant.h
+++ b/gsupplicant/gsupplicant.h
@@ -73,8 +73,6 @@ extern "C" {
 #define G_SUPPLICANT_PAIRWISE_TKIP     (1 << 1)
 #define G_SUPPLICANT_PAIRWISE_CCMP     (1 << 2)
 
-#define G_SUPPLICANT_MAX_FAST_SCAN     4
-
 #define G_SUPPLICANT_WPS_CONFIGURED     (1 << 0)
 #define G_SUPPLICANT_WPS_PBC            (1 << 1)
 #define G_SUPPLICANT_WPS_PIN            (1 << 2)
@@ -97,6 +95,7 @@ typedef enum {
 
 typedef enum {
        G_SUPPLICANT_STATE_UNKNOWN,
+       G_SUPPLICANT_STATE_DISABLED,
        G_SUPPLICANT_STATE_DISCONNECTED,
        G_SUPPLICANT_STATE_INACTIVE,
        G_SUPPLICANT_STATE_SCANNING,
@@ -139,21 +138,26 @@ struct _GSupplicantSSID {
 
 typedef struct _GSupplicantSSID GSupplicantSSID;
 
+struct scan_ssid {
+       unsigned char ssid[32];
+       uint8_t ssid_len;
+};
+
 struct _GSupplicantScanParams {
-       struct scan_ssid {
-               unsigned char ssid[32];
-               uint8_t ssid_len;
-       } ssids[G_SUPPLICANT_MAX_FAST_SCAN];
+       GSList *ssids;
 
        uint8_t num_ssids;
 
-       uint16_t freqs[G_SUPPLICANT_MAX_FAST_SCAN];
+       uint8_t num_freqs;
+       uint16_t *freqs;
 };
 
 typedef struct _GSupplicantScanParams GSupplicantScanParams;
 
 /* global API */
-typedef void (*GSupplicantCountryCallback) (void *user_data);
+typedef void (*GSupplicantCountryCallback) (int result,
+                                               const char *alpha2,
+                                                       void *user_data);
 
 int g_supplicant_set_country(const char *alpha2,
                                GSupplicantCountryCallback callback,
@@ -180,6 +184,11 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface,
                                        GSupplicantInterfaceCallback callback,
                                                        void *user_data);
 
+int g_supplicant_interface_autoscan(GSupplicantInterface *interface,
+                                       const char *autoscan_data,
+                                       GSupplicantInterfaceCallback callback,
+                                                       void *user_data);
+
 int g_supplicant_interface_connect(GSupplicantInterface *interface,
                                        GSupplicantSSID *ssid,
                                        GSupplicantInterfaceCallback callback,
@@ -209,6 +218,10 @@ unsigned int g_supplicant_interface_get_max_scan_ssids(
 
 int g_supplicant_interface_enable_selected_network(GSupplicantInterface *interface,
                                                        dbus_bool_t enable);
+int g_supplicant_interface_set_country(GSupplicantInterface *interface,
+                                       GSupplicantCountryCallback callback,
+                                                       const char *alpha2,
+                                                       void *user_data);
 
 /* Network API */
 struct _GSupplicantNetwork;
@@ -250,6 +263,14 @@ typedef struct _GSupplicantCallbacks GSupplicantCallbacks;
 int g_supplicant_register(const GSupplicantCallbacks *callbacks);
 void g_supplicant_unregister(const GSupplicantCallbacks *callbacks);
 
+static inline
+void g_supplicant_free_scan_params(GSupplicantScanParams *scan_params)
+{
+       g_slist_free_full(scan_params->ssids, g_free);
+       g_free(scan_params->freqs);
+       g_free(scan_params);
+}
+
 #ifdef __cplusplus
 }
 #endif