X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gsupplicant%2Fgsupplicant.h;h=d748ff630b75b553e8d4809f4f8f5202f2697a67;hb=25160aada7784cf402230d9cb67f441802bb9c63;hp=597fe75125dbd389a75010b1f7ca7e97a257e6d0;hpb=3c5d316b64f60ee6fb7b2bb85c22fad385cb0f91;p=platform%2Fupstream%2Fconnman.git diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h old mode 100644 new mode 100755 index 597fe75..d748ff6 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -69,8 +69,10 @@ 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_WIFI_MESH +#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) @@ -122,9 +124,9 @@ typedef enum { #if defined TIZEN_EXT G_SUPPLICANT_SECURITY_FT_PSK, G_SUPPLICANT_SECURITY_FT_IEEE8021X, -#endif -#if defined TIZEN_EXT_WIFI_MESH G_SUPPLICANT_SECURITY_SAE, + G_SUPPLICANT_SECURITY_OWE, + G_SUPPLICANT_SECURITY_DPP, #endif } GSupplicantSecurity; @@ -177,11 +179,13 @@ 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 @@ -213,7 +217,6 @@ 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; @@ -221,9 +224,11 @@ struct _GSupplicantSSID { GSupplicantEapKeymgmt eap_keymgmt; const char *phase1; const char *pac_file; -#endif -#if defined TIZEN_EXT_WIFI_MESH uint16_t ieee80211w; + unsigned int keymgmt; + const char *connector; + const char *c_sign_key; + const char *net_access_key; #endif }; @@ -299,8 +304,8 @@ typedef void (*GSupplicantInterfaceCallback) (int result, void *user_data); #if defined TIZEN_EXT -typedef void (*GSupplicantMaxSpeedCallback) (int result, - int maxspeed, void *user_data); +typedef void (*GSupplicantMaxSpeedCallback) (int result, int maxspeed, + int strength, void *user_data); #endif void g_supplicant_interface_cancel(GSupplicantInterface *interface); @@ -368,6 +373,9 @@ 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); +#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); @@ -469,7 +477,25 @@ const unsigned char *g_supplicant_network_get_countrycode(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); + #endif +#if defined TIZEN_EXT +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); +#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); @@ -492,9 +518,12 @@ struct _GSupplicantCallbacks { #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, @@ -512,11 +541,32 @@ struct _GSupplicantCallbacks { 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 +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 + +#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