Do not include related code if INS is not enabled

[platform/upstream/connman.git] / gsupplicant / supplicant.c

diff --git a/gsupplicant/supplicant.c b/gsupplicant/supplicant.c
index e63831b..3174857 100755 (executable)
--- a/gsupplicant/supplicant.c
+++ b/gsupplicant/supplicant.c
@@ -191,7 +191,7 @@ struct _GSupplicantINSSettings {
 static struct _GSupplicantINSSettings ins_settings;
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT_INS
 static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
        0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 };
@@ -2023,6 +2023,7 @@ static bool compare_bssid(unsigned char *bssid_a, unsigned char *bssid_b)
        return false;
 }
 
+#if defined TIZEN_EXT_INS
 static gchar *convert_bssid_to_str(unsigned char *bssid)
 {
        GString *bssid_str;
@@ -2041,7 +2042,6 @@ static gchar *convert_bssid_to_str(unsigned char *bssid)
        return g_string_free(bssid_str, FALSE);
 }
 
-#if defined TIZEN_EXT_INS
 static void count_assoc_reject(gpointer data, gpointer user_data)
 {
        time_t assoc_reject_time = GPOINTER_TO_INT(data);
@@ -2183,7 +2183,7 @@ static int calculate_score(bool is_last_connected, uint16_t assoc_reject_cnt,
 
        return score;
 }
-#endif
+#endif /* defined TIZEN_EXT_INS */
 
 static void update_bssid_list(gpointer key, gpointer value, gpointer user_data)
 {
@@ -2257,11 +2257,12 @@ static void print_bssid_sort(gpointer data, gpointer user_data)
        if (!bssids || !network)
                return;
 
-       SUPPLICANT_DBG("ssid [%-20s] bssid[" MACSTR "] total[%2d] freq[%2d] "
-                       "last_conn[%2d] assoc_reject[%2d] strength[%2d] rssi[%2d]",
-                       network->ssid, MAC2STR(bssids->bssid), bssids->ins_score,
-                       bssids->score_frequency, bssids->score_last_connected_bssid,
-                       bssids->score_assoc_reject, bssids->score_strength, bssids->strength - 120);
+       if (!simplified_log)
+               SUPPLICANT_DBG("ssid [%-20s] bssid[" MACSTR "] total[%2d] freq[%2d] "
+                               "last_conn[%2d] assoc_reject[%2d] strength[%2d] rssi[%2d]",
+                               network->ssid, MAC2STR(bssids->bssid), bssids->ins_score,
+                               bssids->score_frequency, bssids->score_last_connected_bssid,
+                               bssids->score_assoc_reject, bssids->score_strength, bssids->strength - 120);
 }
 #endif
 
@@ -2286,6 +2287,7 @@ void *g_supplicant_network_get_bssid_list(GSupplicantNetwork *network)
        return bssid_data.bssid_list;
 }
 
+#if defined TIZEN_EXT_INS
 void g_supplicant_network_set_last_connected_bssid(GSupplicantNetwork *network, const unsigned char *bssid)
 {
        if (!bssid)
@@ -2351,15 +2353,6 @@ GHashTable *g_supplicant_network_get_assoc_reject_table(GSupplicantNetwork *netw
        return network->assoc_reject_table;
 }
 
-GSupplicantNetwork *g_supplicant_interface_get_network(GSupplicantInterface *interface,
-               const char *group)
-{
-       if (!interface)
-               return NULL;
-
-       return g_hash_table_lookup(interface->network_table, group);
-}
-
 static void copy_assoc_reject(gpointer key, gpointer value, gpointer user_data)
 {
        struct assoc_reject_data *cloned_assoc_data;
@@ -2395,8 +2388,17 @@ GHashTable *g_supplicant_network_clone_assoc_reject_table(GSupplicantNetwork *ne
 
        return cloned_assoc_reject_table;
 }
+#endif /* defined TIZEN_EXT_INS */
 
-#endif
+GSupplicantNetwork *g_supplicant_interface_get_network(GSupplicantInterface *interface,
+               const char *group)
+{
+       if (!interface)
+               return NULL;
+
+       return g_hash_table_lookup(interface->network_table, group);
+}
+#endif /* defined TIZEN_EXT */
 
 static void merge_network(GSupplicantNetwork *network)
 {
@@ -3548,7 +3550,7 @@ static void update_network_signal(GSupplicantNetwork *network)
        SUPPLICANT_DBG("New network signal %d", network->signal);
 }
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT_INS
 static gboolean last_connected_timeout(gpointer data)
 {
        GSupplicantInterface *interface = data;
@@ -3599,7 +3601,7 @@ static void remove_timer_for_last_connected(GSupplicantInterface *interface)
                }
        }
 }
-#endif
+#endif /* defined TIZEN_EXT_INS */
 
 static void interface_current_bss(GSupplicantInterface *interface,
                                                DBusMessageIter *iter)
@@ -3695,7 +3697,7 @@ static void interface_current_bss(GSupplicantInterface *interface,
        case G_SUPPLICANT_STATE_GROUP_HANDSHAKE:
        case G_SUPPLICANT_STATE_COMPLETED:
                callback_network_associated(network);
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT_INS
                add_timer_for_last_connected(interface);
 #endif
                break;
@@ -3854,7 +3856,7 @@ static void interface_property(const char *key, DBusMessageIter *iter,
                                interface->state = string2state(str);
                                callback_interface_state(interface);
                        }
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT_INS
                switch (interface->state) {
                case G_SUPPLICANT_STATE_COMPLETED:
                        add_timer_for_last_connected(interface);