X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=4e0118d95055054ac40b30730fc93ba6935e01ed;hb=57156cc5738cfbf60e1b0ddf444ad6eec5964a0d;hp=0df86408f99e640a30180aad7e4a4b9e573d2526;hpb=beec5f11ed9c7d343d56bc29638196051a308217;p=framework%2Fconnectivity%2Fconnman.git diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index 0df8640..4e0118d 100644 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -2,7 +2,7 @@ * * WPA supplicant library with GLib integration * - * Copyright (C) 2010 Intel Corporation. All rights reserved. + * Copyright (C) 2012 Intel Corporation. All rights reserved. * * 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 @@ -61,6 +61,9 @@ extern "C" { #define G_SUPPLICANT_KEYMGMT_WPA_EAP_256 (1 << 8) #define G_SUPPLICANT_KEYMGMT_WPS (1 << 9) +#define G_SUPPLICANT_PROTO_WPA (1 << 0) +#define G_SUPPLICANT_PROTO_RSN (1 << 1) + #define G_SUPPLICANT_GROUP_WEP40 (1 << 0) #define G_SUPPLICANT_GROUP_WEP104 (1 << 1) #define G_SUPPLICANT_GROUP_TKIP (1 << 2) @@ -70,10 +73,16 @@ extern "C" { #define G_SUPPLICANT_PAIRWISE_TKIP (1 << 1) #define G_SUPPLICANT_PAIRWISE_CCMP (1 << 2) +#define G_SUPPLICANT_WPS_CONFIGURED (1 << 0) +#define G_SUPPLICANT_WPS_PBC (1 << 1) +#define G_SUPPLICANT_WPS_PIN (1 << 2) +#define G_SUPPLICANT_WPS_REGISTRAR (1 << 3) + typedef enum { G_SUPPLICANT_MODE_UNKNOWN, G_SUPPLICANT_MODE_INFRA, G_SUPPLICANT_MODE_IBSS, + G_SUPPLICANT_MODE_MASTER, } GSupplicantMode; typedef enum { @@ -106,8 +115,13 @@ typedef enum { struct _GSupplicantSSID { const void *ssid; unsigned int ssid_len; + unsigned int scan_ssid; GSupplicantMode mode; GSupplicantSecurity security; + unsigned int protocol; + unsigned int pairwise_cipher; + unsigned int group_cipher; + unsigned int freq; const char *eap; const char *passphrase; const char *identity; @@ -118,12 +132,39 @@ struct _GSupplicantSSID { const char *phase2_auth; dbus_bool_t use_wps; const char *pin_wps; + const char *bgscan; }; typedef struct _GSupplicantSSID GSupplicantSSID; +/* + * Max number of SSIDs that can be scanned. + * In wpa_s 0.7x the limit is 4. + * In wps_s 0.8 or later it is 16. + * The value is only used if wpa_supplicant does not return any max limit + * for number of scannable SSIDs. + */ +#define WPAS_MAX_SCAN_SSIDS 4 + +struct scan_ssid { + unsigned char ssid[32]; + uint8_t ssid_len; +}; + +struct _GSupplicantScanParams { + GSList *ssids; + + uint8_t num_ssids; + + 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, @@ -139,12 +180,19 @@ typedef void (*GSupplicantInterfaceCallback) (int result, void *user_data); int g_supplicant_interface_create(const char *ifname, const char *driver, + const char *bridge, GSupplicantInterfaceCallback callback, void *user_data); int g_supplicant_interface_remove(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); int g_supplicant_interface_scan(GSupplicantInterface *interface, + GSupplicantScanParams *scan_data, + GSupplicantInterfaceCallback callback, + void *user_data); + +int g_supplicant_interface_autoscan(GSupplicantInterface *interface, + const char *autoscan_data, GSupplicantInterfaceCallback callback, void *user_data); @@ -157,6 +205,9 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); +int g_supplicant_interface_set_apscan(GSupplicantInterface *interface, + unsigned int ap_scan); + void g_supplicant_interface_set_data(GSupplicantInterface *interface, void *data); void *g_supplicant_interface_get_data(GSupplicantInterface *interface); @@ -167,6 +218,17 @@ const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface); const void *g_supplicant_interface_get_wps_ssid(GSupplicantInterface *interface, unsigned int *ssid_len); GSupplicantWpsState g_supplicant_interface_get_wps_state(GSupplicantInterface *interface); +unsigned int g_supplicant_interface_get_mode(GSupplicantInterface *interface); +dbus_bool_t g_supplicant_interface_get_ready(GSupplicantInterface *interface); +unsigned int g_supplicant_interface_get_max_scan_ssids( + GSupplicantInterface *interface); + +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; @@ -182,7 +244,11 @@ const void *g_supplicant_network_get_ssid(GSupplicantNetwork *network, const char *g_supplicant_network_get_mode(GSupplicantNetwork *network); const char *g_supplicant_network_get_security(GSupplicantNetwork *network); dbus_int16_t g_supplicant_network_get_signal(GSupplicantNetwork *network); +dbus_uint16_t g_supplicant_network_get_frequency(GSupplicantNetwork *network); dbus_bool_t g_supplicant_network_get_wps(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_is_wps_active(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_is_wps_pbc(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_is_wps_advertizing(GSupplicantNetwork *network); struct _GSupplicantCallbacks { void (*system_ready) (void); @@ -194,6 +260,8 @@ struct _GSupplicantCallbacks { void (*scan_finished) (GSupplicantInterface *interface); void (*network_added) (GSupplicantNetwork *network); void (*network_removed) (GSupplicantNetwork *network); + void (*network_changed) (GSupplicantNetwork *network, + const char *property); void (*debug) (const char *str); }; @@ -202,6 +270,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