diff options
Diffstat (limited to 'gsupplicant/gsupplicant.h')
| -rwxr-xr-x | gsupplicant/gsupplicant.h | 44 |
1 files changed, 34 insertions, 10 deletions
diff --git a/gsupplicant/gsupplicant.h b/gsupplicant/gsupplicant.h index 0823a394..61b63dd6 100755 --- a/gsupplicant/gsupplicant.h +++ b/gsupplicant/gsupplicant.h @@ -71,6 +71,7 @@ extern "C" { #define G_SUPPLICANT_KEYMGMT_WPS (1 << 9) #if defined TIZEN_EXT #define G_SUPPLICANT_KEYMGMT_SAE (1 << 10) +#define G_SUPPLICANT_KEYMGMT_FT_SAE (1 << 11) #define G_SUPPLICANT_KEYMGMT_OWE (1 << 22) #define G_SUPPLICANT_KEYMGMT_DPP (1 << 23) #endif @@ -127,6 +128,7 @@ typedef enum { G_SUPPLICANT_SECURITY_SAE, G_SUPPLICANT_SECURITY_OWE, G_SUPPLICANT_SECURITY_DPP, + G_SUPPLICANT_SECURITY_PSK_SHA256, #endif } GSupplicantSecurity; @@ -187,6 +189,12 @@ typedef enum { } GSupplicantINSPreferredFreq; #endif +typedef enum { + G_SUPPLICANT_MFP_NONE, + G_SUPPLICANT_MFP_OPTIONAL, + G_SUPPLICANT_MFP_REQUIRED, +} GSupplicantMfpOptions; + struct _GSupplicantSSID { #if defined TIZEN_EXT void *ssid; @@ -224,12 +232,16 @@ struct _GSupplicantSSID { 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; + bool is_passphrase_alloc; + bool is_connector_alloc; + bool is_c_sign_key_alloc; + bool is_net_access_key_alloc; #endif + GSupplicantMfpOptions ieee80211w; }; typedef struct _GSupplicantSSID GSupplicantSSID; @@ -281,6 +293,10 @@ 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 { @@ -289,14 +305,13 @@ struct g_connman_bssids { uint16_t frequency; uint16_t assoc_reject_cnt; bool is_last_connected; + unsigned int est_throughput; 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 @@ -326,7 +341,8 @@ typedef void (*GSupplicantInterfaceCallback) (int result, #if defined TIZEN_EXT typedef void (*GSupplicantMaxSpeedCallback) (int result, int maxspeed, - int strength, int snr, void *user_data); + int strength, int snr, void *user_data, + unsigned int est_throughput); #endif void g_supplicant_interface_cancel(GSupplicantInterface *interface); @@ -395,6 +411,11 @@ int g_supplicant_interface_disconnect(GSupplicantInterface *interface, int g_supplicant_interface_set_bss_expiration_age(GSupplicantInterface *interface, unsigned int bss_expiration_age); +#if defined TIZEN_EXT +void g_supplicant_interface_remove_network(GSupplicantInterface *interface, + GSupplicantSSID *ssid); +#endif + int g_supplicant_interface_set_apscan(GSupplicantInterface *interface, unsigned int ap_scan); @@ -404,6 +425,7 @@ 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); +bool g_supplicant_interface_get_is_6_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); @@ -530,16 +552,18 @@ 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); +GSupplicantNetwork *g_supplicant_interface_get_network(GSupplicantInterface *interface, + const char *group); -#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); +GHashTable *g_supplicant_network_clone_assoc_reject_table(GSupplicantNetwork *network); #endif #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET @@ -598,12 +622,12 @@ struct _GSupplicantCallbacks { typedef struct _GSupplicantCallbacks GSupplicantCallbacks; -#if defined TIZEN_EXT && defined TIZEN_EXT_INS +#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 /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ +#endif /* defined TIZEN_EXT */ #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET void g_supplicant_replace_config_file(const char *ifname, const char *config_file); |