X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=884c92e37463f07b8398ccd5dc3697d61968353d;hb=00b8c314dc2cfb641494d413f4b00d90a10ecbeb;hp=fe693cdbbdea82c9775eb5691ee21edb9fb2a297;hpb=6289f6a099afd889a013f895fca9df34028c2fb7;p=platform%2Fupstream%2Fconnman.git diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index fe693cd..884c92e 100755 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -50,6 +50,9 @@ extern "C" { #define G_SUPPLICANT_CAPABILITY_MODE_IBSS (1 << 1) #define G_SUPPLICANT_CAPABILITY_MODE_AP (1 << 2) #define G_SUPPLICANT_CAPABILITY_MODE_P2P (1 << 3) +#if defined TIZEN_EXT_WIFI_MESH +#define G_SUPPLICANT_CAPABILITY_MODE_MESH (1 << 4) +#endif #define G_SUPPLICANT_KEYMGMT_NONE (1 << 0) #define G_SUPPLICANT_KEYMGMT_IEEE8021X (1 << 1) @@ -66,6 +69,11 @@ extern "C" { #define G_SUPPLICANT_KEYMGMT_WPA_EAP (1 << 7) #define G_SUPPLICANT_KEYMGMT_WPA_EAP_256 (1 << 8) #define G_SUPPLICANT_KEYMGMT_WPS (1 << 9) +#if defined TIZEN_EXT +#define G_SUPPLICANT_KEYMGMT_SAE (1 << 10) +#define G_SUPPLICANT_KEYMGMT_OWE (1 << 22) +#define G_SUPPLICANT_KEYMGMT_DPP (1 << 23) +#endif #define G_SUPPLICANT_PROTO_WPA (1 << 0) #define G_SUPPLICANT_PROTO_RSN (1 << 1) @@ -94,8 +102,19 @@ typedef enum { G_SUPPLICANT_MODE_INFRA, G_SUPPLICANT_MODE_IBSS, G_SUPPLICANT_MODE_MASTER, +#if defined TIZEN_EXT_WIFI_MESH + G_SUPPLICANT_MODE_MESH, +#endif } GSupplicantMode; +#if defined TIZEN_EXT_WIFI_MESH +typedef enum { + G_SUPPLICANT_IEEE80211W_UNKNOWN, + G_SUPPLICANT_IEEE80211W_OPTIONAL, + G_SUPPLICANT_IEEE80211W_REQUIRED, +} GSupplicantPmf; +#endif + typedef enum { G_SUPPLICANT_SECURITY_UNKNOWN, G_SUPPLICANT_SECURITY_NONE, @@ -105,9 +124,31 @@ typedef enum { #if defined TIZEN_EXT G_SUPPLICANT_SECURITY_FT_PSK, G_SUPPLICANT_SECURITY_FT_IEEE8021X, + G_SUPPLICANT_SECURITY_SAE, + G_SUPPLICANT_SECURITY_OWE, + G_SUPPLICANT_SECURITY_DPP, #endif } GSupplicantSecurity; +#if defined TIZEN_EXT +typedef enum { + G_SUPPLICANT_EAP_KEYMGMT_NONE, + G_SUPPLICANT_EAP_KEYMGMT_FT, + G_SUPPLICANT_EAP_KEYMGMT_CCKM, + G_SUPPLICANT_EAP_KEYMGMT_OKC, +} GSupplicantEapKeymgmt; + +typedef enum { + G_SUPPLICANT_MODE_IEEE80211_UNKNOWN, + G_SUPPLICANT_MODE_IEEE80211B, + G_SUPPLICANT_MODE_IEEE80211BG, + G_SUPPLICANT_MODE_IEEE80211BGN, + G_SUPPLICANT_MODE_IEEE80211A, + G_SUPPLICANT_MODE_IEEE80211AN, + G_SUPPLICANT_MODE_IEEE80211ANAC, +} GSupplicantPhy_mode; +#endif + typedef enum { G_SUPPLICANT_STATE_UNKNOWN, G_SUPPLICANT_STATE_DISABLED, @@ -138,14 +179,20 @@ typedef enum { G_SUPPLICANT_PEER_GROUP_FAILED, } GSupplicantPeerState; -enum GSupplicantAPHiddenSSID { - G_SUPPLICANT_AP_NO_SSID_HIDING, - G_SUPPLICANT_AP_HIDDEN_SSID_ZERO_LEN, - G_SUPPLICANT_AP_HIDDEN_SSID_ZERO_CONTENTS, -}; +#if defined TIZEN_EXT +typedef enum { + G_SUPPLICANT_INS_PREFERRED_FREQ_UNKNOWN, + G_SUPPLICANT_INS_PREFERRED_FREQ_24GHZ, + G_SUPPLICANT_INS_PREFERRED_FREQ_5GHZ, +} GSupplicantINSPreferredFreq; +#endif struct _GSupplicantSSID { +#if defined TIZEN_EXT + void *ssid; +#else const void *ssid; +#endif unsigned int ssid_len; unsigned int scan_ssid; GSupplicantMode mode; @@ -157,7 +204,12 @@ struct _GSupplicantSSID { const char *eap; const char *passphrase; const char *identity; + const char *anonymous_identity; const char *ca_cert_path; + const char *subject_match; + const char *altsubject_match; + const char *domain_suffix_match; + const char *domain_match; const char *client_cert_path; const char *private_key_path; const char *private_key_passphrase; @@ -165,9 +217,18 @@ struct _GSupplicantSSID { dbus_bool_t use_wps; const char *pin_wps; const char *bgscan; - int ignore_broadcast_ssid; #if defined TIZEN_EXT unsigned char *bssid; + unsigned int bssid_for_connect_len; + unsigned char bssid_for_connect[6]; + GSupplicantEapKeymgmt eap_keymgmt; + const char *phase1; + const char *pac_file; + uint16_t ieee80211w; + unsigned int keymgmt; + const char *connector; + const char *c_sign_key; + const char *net_access_key; #endif }; @@ -219,6 +280,31 @@ struct _GSupplicantP2PServiceParams { typedef struct _GSupplicantP2PServiceParams GSupplicantP2PServiceParams; +#if defined TIZEN_EXT +#define WIFI_BSSID_STR_LEN 18 +#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5] +#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x" + +#define WIFI_BSSID_LEN_MAX 6 + +struct g_connman_bssids { + unsigned char bssid[WIFI_BSSID_LEN_MAX]; + uint16_t strength; + uint16_t frequency; + uint16_t assoc_reject_cnt; + bool is_last_connected; + int score_snr; +#if defined TIZEN_EXT_INS + int score_last_connected_bssid; + int score_assoc_reject; + int score_frequency; + int score_strength; + int score_est_throughput; +#endif + int ins_score; +}; +#endif + /* global API */ typedef void (*GSupplicantCountryCallback) (int result, const char *alpha2, @@ -234,15 +320,28 @@ struct _GSupplicantPeer; typedef struct _GSupplicantInterface GSupplicantInterface; typedef struct _GSupplicantPeer GSupplicantPeer; +#if defined TIZEN_EXT_WIFI_MESH +typedef struct _GSupplicantMeshPeer GSupplicantMeshPeer; +#endif typedef void (*GSupplicantInterfaceCallback) (int result, GSupplicantInterface *interface, void *user_data); +#if defined TIZEN_EXT +typedef void (*GSupplicantMaxSpeedCallback) (int result, int maxspeed, + int strength, int snr, void *user_data); +#endif + void g_supplicant_interface_cancel(GSupplicantInterface *interface); int g_supplicant_interface_create(const char *ifname, const char *driver, const char *bridge, +#ifdef TIZEN_EXT + unsigned int mac_policy, + unsigned int preassoc_mac_policy, + unsigned int random_mac_lifetime, +#endif /* TIZEN_EXT */ GSupplicantInterfaceCallback callback, void *user_data); int g_supplicant_interface_remove(GSupplicantInterface *interface, @@ -253,6 +352,12 @@ int g_supplicant_interface_scan(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); +#if defined TIZEN_EXT +int g_supplicant_interface_signalpoll(GSupplicantInterface *interface, + GSupplicantMaxSpeedCallback callback, + void *user_data); +#endif + int g_supplicant_interface_p2p_find(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); @@ -291,9 +396,9 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface, GSupplicantInterfaceCallback callback, void *user_data); -#if defined TIZEN_EXT -int g_supplicant_interface_remove_network(GSupplicantInterface *interface); -#endif +int g_supplicant_interface_set_bss_expiration_age(GSupplicantInterface *interface, + unsigned int bss_expiration_age); + int g_supplicant_interface_set_apscan(GSupplicantInterface *interface, unsigned int ap_scan); @@ -301,6 +406,27 @@ void g_supplicant_interface_set_data(GSupplicantInterface *interface, void *data); void *g_supplicant_interface_get_data(GSupplicantInterface *interface); const char *g_supplicant_interface_get_ifname(GSupplicantInterface *interface); +#if defined TIZEN_EXT +bool g_supplicant_interface_get_is_5_0_ghz_supported(GSupplicantInterface *interface); +unsigned char *g_supplicant_interface_get_add_network_bssid(GSupplicantInterface *interface); + +typedef void (*GSupplicantMacPolicyCallback) (int result, unsigned int policy, void *user_data); +int g_supplicant_interface_set_mac_policy(GSupplicantInterface *interface, + GSupplicantMacPolicyCallback callback, + unsigned int policy, + void *user_data); + +int g_supplicant_interface_set_preassoc_mac_policy(GSupplicantInterface *interface, + GSupplicantMacPolicyCallback callback, + unsigned int policy, + void *user_data); + +typedef void (*GSupplicantRandomMaclifetimeCallback) (int result, unsigned int lifetime, void *user_data); +int g_supplicant_interface_set_random_mac_lifetime(GSupplicantInterface *interface, + GSupplicantRandomMaclifetimeCallback callback, + unsigned int lifetime, + void *user_data); +#endif const char *g_supplicant_interface_get_driver(GSupplicantInterface *interface); GSupplicantState g_supplicant_interface_get_state(GSupplicantInterface *interface); const char *g_supplicant_interface_get_wps_key(GSupplicantInterface *interface); @@ -326,6 +452,26 @@ GSupplicantPeer *g_supplicant_interface_peer_lookup(GSupplicantInterface *interf const char *identifier); bool g_supplicant_interface_is_p2p_finding(GSupplicantInterface *interface); +#if defined TIZEN_EXT_WIFI_MESH +bool g_supplicant_interface_has_mesh(GSupplicantInterface *interface); +int g_supplicant_mesh_interface_create(const char *ifname, const char *driver, + const char *bridge, const char *parent_ifname, + GSupplicantInterfaceCallback callback, void *user_data); +const void *g_supplicant_interface_get_mesh_group_ssid( + GSupplicantInterface *interface, + unsigned int *ssid_len); +int g_supplicant_mesh_get_disconnect_reason(GSupplicantInterface *interface); +const char *g_supplicant_mesh_peer_get_address(GSupplicantMeshPeer *mesh_peer); +int g_supplicant_mesh_peer_get_disconnect_reason( + GSupplicantMeshPeer *mesh_peer); +int g_supplicant_interface_abort_scan(GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, void *user_data); +int g_supplicant_interface_mesh_peer_change_status( + GSupplicantInterface *interface, + GSupplicantInterfaceCallback callback, const char *peer_address, + const char *method, void *user_data); +#endif + /* Network and Peer API */ struct _GSupplicantNetwork; struct _GSupplicantGroup; @@ -372,13 +518,40 @@ const unsigned char *g_supplicant_network_get_bssid( unsigned int g_supplicant_network_get_maxrate(GSupplicantNetwork *network); const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network); bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network); -unsigned int g_supplicant_network_is_hs20AP(GSupplicantNetwork *network); +bool g_supplicant_network_is_hs20AP(GSupplicantNetwork *network); const char *g_supplicant_network_get_eap(GSupplicantNetwork *network); const char *g_supplicant_network_get_identity(GSupplicantNetwork *network); const char *g_supplicant_network_get_phase2(GSupplicantNetwork *network); unsigned int g_supplicant_network_get_keymgmt(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_get_privacy(GSupplicantNetwork *network); +void *g_supplicant_network_get_wifi_vsie(GSupplicantNetwork *network); +const unsigned char *g_supplicant_network_get_countrycode(GSupplicantNetwork + *network); +dbus_bool_t g_supplicant_network_is_pmf_required(GSupplicantNetwork *network); +void *g_supplicant_network_get_bssid_list(GSupplicantNetwork *network); +GSupplicantPhy_mode g_supplicant_network_get_phy_mode(GSupplicantNetwork *network); +dbus_bool_t g_supplicant_network_get_transition_mode(GSupplicantNetwork *network); +const unsigned char *g_supplicant_network_get_transition_mode_bssid(GSupplicantNetwork *network); +const void *g_supplicant_network_get_transition_mode_ssid(GSupplicantNetwork *network, + unsigned int *transition_mode_ssid_len); +void g_supplicant_network_set_signal(GSupplicantNetwork *network, int signal); +void g_supplicant_network_set_bss_signal(GSupplicantNetwork *network, + int signal, int snr); + +void g_supplicant_network_set_last_connected_bssid(GSupplicantNetwork *network, const unsigned char *bssid); +const unsigned char *g_supplicant_network_get_last_connected_bssid(GSupplicantNetwork *network); +void g_supplicant_network_update_assoc_reject(GSupplicantInterface *interface, + GSupplicantNetwork *network); +GHashTable *g_supplicant_network_get_assoc_reject_table(GSupplicantNetwork *network); +GSupplicantNetwork *g_supplicant_interface_get_network(GSupplicantInterface *interface, + const char *group); +GHashTable *g_supplicant_network_clone_assoc_reject_table(GSupplicantNetwork *network); #endif +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +typedef void (*g_supplicant_eap_callback)(GSupplicantInterface *interface, bool status); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + struct _GSupplicantCallbacks { void (*system_ready) (void); void (*system_killed) (void); @@ -388,6 +561,7 @@ struct _GSupplicantCallbacks { void (*p2p_support) (GSupplicantInterface *interface); void (*scan_started) (GSupplicantInterface *interface); void (*scan_finished) (GSupplicantInterface *interface); + void (*ap_create_fail) (GSupplicantInterface *interface); void (*network_added) (GSupplicantNetwork *network); void (*network_removed) (GSupplicantNetwork *network); #if defined TIZEN_EXT @@ -395,11 +569,16 @@ struct _GSupplicantCallbacks { #endif void (*network_changed) (GSupplicantNetwork *network, const char *property); + void (*network_associated) (GSupplicantNetwork *network); #if defined TIZEN_EXT void (*system_power_off) (void); + void (*assoc_failed) (void *user_data); + void (*scan_done) (GSupplicantInterface *interface); #endif - void (*add_station) (const char *mac); - void (*remove_station) (const char *mac); + void (*sta_authorized) (GSupplicantInterface *interface, + const char *addr); + void (*sta_deauthorized) (GSupplicantInterface *interface, + const char *addr); void (*peer_found) (GSupplicantPeer *peer); void (*peer_lost) (GSupplicantPeer *peer); void (*peer_changed) (GSupplicantPeer *peer, @@ -407,12 +586,42 @@ struct _GSupplicantCallbacks { void (*peer_request) (GSupplicantPeer *peer); void (*debug) (const char *str); void (*disconnect_reasoncode)(GSupplicantInterface *interface, - int reasoncode); + int reasoncode); + void (*assoc_status_code)(GSupplicantInterface *interface, + int reasoncode); +#if defined TIZEN_EXT_WIFI_MESH + void (*mesh_support) (GSupplicantInterface *interface); + void (*mesh_group_started) (GSupplicantInterface *interface); + void (*mesh_group_removed) (GSupplicantInterface *interface); + void (*mesh_peer_connected) (GSupplicantMeshPeer *mesh_peer); + void (*mesh_peer_disconnected) (GSupplicantMeshPeer *mesh_peer); +#endif + +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET + g_supplicant_eap_callback eap; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ }; typedef struct _GSupplicantCallbacks GSupplicantCallbacks; +#if defined TIZEN_EXT && defined TIZEN_EXT_INS +void g_supplicant_set_ins_settings(GSupplicantINSPreferredFreq preferred_freq_bssid, + bool last_connected_bssid, bool assoc_reject, bool signal_bssid, + unsigned int preferred_freq_bssid_score, unsigned int last_connected_bssid_score, + unsigned int assoc_reject_score, int signal_level3_5ghz, int signal_level3_24ghz); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ + +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +void g_supplicant_replace_config_file(const char *ifname, const char *config_file); +void g_supplicant_register_eap_callback(g_supplicant_eap_callback cb); +void g_supplicant_unregister_eap_callback(void); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ + +#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET +int g_supplicant_register(GSupplicantCallbacks *callbacks); +#else /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ int g_supplicant_register(const GSupplicantCallbacks *callbacks); +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */ void g_supplicant_unregister(const GSupplicantCallbacks *callbacks); static inline