diff options
Diffstat (limited to 'gsupplicant/supplicant.c')
| -rwxr-xr-x | gsupplicant/supplicant.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c index d9d69ea0..fe1b21f5 100755 --- a/gsupplicant/supplicant.c +++ b/gsupplicant/supplicant.c @@ -175,7 +175,7 @@ static struct strvalmap mode_capa_map[] = { { } }; -#if defined TIZEN_EXT +#if defined TIZEN_EXT && defined TIZEN_EXT_INS struct _GSupplicantINSSettings { GSupplicantINSPreferredFreq preferred_freq_bssid; unsigned int preferred_freq_bssid_score; @@ -189,7 +189,9 @@ struct _GSupplicantINSSettings { }; static struct _GSupplicantINSSettings ins_settings; +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ +#if defined TIZEN_EXT static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; @@ -1855,6 +1857,7 @@ const unsigned char *g_supplicant_network_get_bssid(GSupplicantNetwork *network) return (const unsigned char *)network->best_bss->bssid; } + dbus_bool_t g_supplicant_network_get_transition_mode(GSupplicantNetwork *network) { if (network == NULL) @@ -1863,7 +1866,6 @@ dbus_bool_t g_supplicant_network_get_transition_mode(GSupplicantNetwork *network return network->owe_transition_mode; } - const unsigned char *g_supplicant_network_get_transition_mode_bssid(GSupplicantNetwork *network) { if (network == NULL) @@ -1898,11 +1900,9 @@ const char *g_supplicant_network_get_enc_mode(GSupplicantNetwork *network) return NULL; if (network->best_bss->security == G_SUPPLICANT_SECURITY_PSK || -#if defined TIZEN_EXT network->best_bss->security == G_SUPPLICANT_SECURITY_SAE || network->best_bss->security == G_SUPPLICANT_SECURITY_OWE || network->best_bss->security == G_SUPPLICANT_SECURITY_DPP || -#endif /* TIZEN_EXT */ network->best_bss->security == G_SUPPLICANT_SECURITY_IEEE8021X) { unsigned int pairwise; @@ -1930,12 +1930,10 @@ bool g_supplicant_network_get_rsn_mode(GSupplicantNetwork *network) if (network == NULL || network->best_bss == NULL) return 0; -#if defined TIZEN_EXT if (network->best_bss->security == G_SUPPLICANT_SECURITY_SAE || network->best_bss->security == G_SUPPLICANT_SECURITY_OWE || network->best_bss->security == G_SUPPLICANT_SECURITY_DPP) return false; -#endif /* TIZEN_EXT */ if (network->best_bss->rsn_selected) { const char *mode = g_supplicant_network_get_enc_mode(network); @@ -2056,6 +2054,7 @@ static uint16_t get_assoc_reject_cnt(GHashTable *assoc_reject_table, unsigned ch return assoc_count.assoc_count; } +#if defined TIZEN_EXT_INS static int calculate_score_last_connected_bssid(bool is_last_connected) { int score = 0; @@ -2126,6 +2125,7 @@ static int calculate_score_est_throughput(dbus_uint32_t est_throughput) return score; } +#endif static int calculate_score(bool is_last_connected, uint16_t assoc_reject_cnt, dbus_uint16_t frequency, dbus_int16_t strength, @@ -2133,12 +2133,14 @@ static int calculate_score(bool is_last_connected, uint16_t assoc_reject_cnt, { int score = 0; +#if defined TIZEN_EXT_INS score += calculate_score_last_connected_bssid(is_last_connected); score += calculate_score_assoc_reject(assoc_reject_cnt); score += calculate_score_frequency(strength, frequency); score += calculate_score_strength(strength); score += (int)snr; score += calculate_score_est_throughput(est_throughput); +#endif return score; } @@ -8539,7 +8541,7 @@ static void invoke_introspect_method(void) dbus_message_unref(message); } -#if defined TIZEN_EXT +#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, @@ -8565,7 +8567,7 @@ void g_supplicant_set_ins_settings(GSupplicantINSPreferredFreq preferred_freq_bs SUPPLICANT_DBG("signal_level3_5ghz [%d]", signal_level3_5ghz); SUPPLICANT_DBG("signal_level3_24ghz [%d]", signal_level3_24ghz); } -#endif +#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */ #if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET void g_supplicant_register_eap_callback(g_supplicant_eap_callback cb) |