Use TIZEN_EXT_INS for INS related code

[platform/upstream/connman.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 5a73d09..8ffb254 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -75,6 +75,12 @@ struct saved_profiles {
        gchar *profile_name;
 };
 
+static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+#endif
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 enum connman_ins_preferred_freq {
        CONNMAN_INS_PREFERRED_FREQ_UNKNOWN,
        CONNMAN_INS_PREFERRED_FREQ_24GHZ,
@@ -100,11 +106,7 @@ struct connman_ins_settings {
 };
 
 static struct connman_ins_settings ins_settings;
-
-static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
-       0x00, 0x00, 0x00, 0x00, 0x00, 0x00
-};
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 struct connman_stats {
        bool valid;
@@ -813,7 +815,8 @@ static void count_assoc_reject(gpointer key, gpointer value, gpointer user_data)
        struct assoc_reject_data *assoc_data = value;
        int *assoc_reject_count = user_data;
 
-       *assoc_reject_count += g_slist_length(assoc_data->reject_time_list);
+       if (assoc_data)
+               *assoc_reject_count += g_slist_length(assoc_data->reject_time_list);
 }
 
 static bool update_assoc_reject(struct connman_service *service)
@@ -1834,6 +1837,7 @@ static void __connman_manage_saved_profiles()
                if (!entry) {
                        g_sequence_free(profile_list);
                        g_key_file_free(keyfile);
+                       g_strfreev(services);
                        return;
                }
 
@@ -1857,6 +1861,7 @@ static void __connman_manage_saved_profiles()
        }
 
        g_sequence_free(profile_list);
+       g_strfreev(services);
 }
 #endif
 
@@ -2921,6 +2926,31 @@ struct connman_service *connman_service_get_default_connection(void)
 
        return default_service;
 }
+
+struct connman_service *connman_service_get_connected_service(const char *ifname)
+{
+       GList *list;
+       const char *svc_ifname;
+       struct connman_service *service;
+
+       if (!ifname)
+               return NULL;
+
+       for (list = service_list; list; list = list->next) {
+               service = list->data;
+
+               if (!is_connected(service->state))
+                       continue;
+
+               svc_ifname = connman_device_get_string(
+                               connman_network_get_device(service->network), "Interface");
+
+               if (svc_ifname && g_strcmp0(svc_ifname, ifname) == 0)
+                       return service;
+       }
+
+       return NULL;
+}
 #endif
 
 struct connman_service *connman_service_get_default(void)
@@ -3053,7 +3083,7 @@ static void state_changed(struct connman_service *service)
 #endif
 }
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static void connect_reason_changed(struct connman_service *service)
 {
        struct connman_device *device;
@@ -3087,7 +3117,9 @@ static void connect_reason_changed(struct connman_service *service)
                                            DBUS_TYPE_INT32,
                                            &service->connect_reason);
 }
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
+#if defined TIZEN_EXT
 static void disconnection_requested_changed(struct connman_service *service)
 {
        dbus_bool_t disconnection_requested;
@@ -4534,7 +4566,7 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_network_append_acddbus(dict, service->network);
 }
 
-#if defined TIZEN_EXT_INS
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static void append_ins_bssid_info(DBusMessageIter *iter, void *user_data)
 {
        GSList *bssid_list = NULL;
@@ -4625,7 +4657,7 @@ static void append_ins_properties(DBusMessageIter *dict,
                                append_ins_bssid_info, service->network);
        }
 }
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 static void append_struct_service(DBusMessageIter *iter,
                connman_dbus_append_cb_t function,
@@ -4664,12 +4696,7 @@ static void append_struct(gpointer value, gpointer user_data)
        append_struct_service(iter, append_dict_properties, service);
 }
 
-void __connman_service_list_struct(DBusMessageIter *iter)
-{
-       g_list_foreach(service_list, append_struct, iter);
-}
-
-#if defined TIZEN_EXT_INS
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static void append_dict_ins_properties(DBusMessageIter *dict, void *user_data)
 {
        struct connman_service *service = user_data;
@@ -4695,7 +4722,12 @@ void __connman_ins_list_struct(DBusMessageIter *iter)
 {
        g_list_foreach(service_list, append_ins_struct, iter);
 }
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
+void __connman_service_list_struct(DBusMessageIter *iter)
+{
+       g_list_foreach(service_list, append_struct, iter);
+}
 
 bool __connman_service_is_hidden(struct connman_service *service)
 {
@@ -4968,7 +5000,7 @@ bool connman_service_get_internet_connection(struct connman_service *service)
        return service->is_internet_connection;
 }
 
-DBusMessage *connman_service_get_defaut_info(DBusMessage *msg,
+DBusMessage *connman_service_create_dbus_service_reply(DBusMessage *msg,
                                                        struct connman_service *service)
 {
        DBusMessage *reply;
@@ -5414,6 +5446,16 @@ int __connman_service_get_use_eapol(struct connman_service *service)
 
        return service->use_eapol;
 }
+
+int __connman_service_get_connect_reason(struct connman_service *service)
+{
+       if (!service) {
+               DBG("Service is NULL");
+               return -1;
+       }
+
+       return service->connect_reason;
+}
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 
 static DBusMessage *get_properties(DBusConnection *conn,
@@ -6164,6 +6206,7 @@ static DBusMessage *set_property(DBusConnection *conn,
                if (err < 0)
                        return __connman_error_failed(msg, -err);
 
+               service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_USER;
                service_save(service);
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
        } else
@@ -7452,7 +7495,27 @@ static DBusMessage *reset_counters(DBusConnection *conn,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-#if defined TIZEN_MAINTAIN_ONLINE
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static DBusMessage *is_eapol_enabled(DBusConnection *conn,
+                                       DBusMessage *msg, void *user_data)
+{
+       struct connman_service *service = user_data;
+       DBG("service: %p path: %s UseEapol: %d", service, service->path, service->use_eapol);
+
+       dbus_bool_t eapol_status = service->use_eapol;
+
+       DBusMessage *reply = dbus_message_new_method_return(msg);
+       if (!reply) {
+               DBG("Failed to initialize reply");
+               return NULL;
+       }
+
+       dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &eapol_status, DBUS_TYPE_INVALID);
+       return reply;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+#if defined TIZEN_EXT
 static DBusMessage *downgrade_service(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -7460,6 +7523,7 @@ static DBusMessage *downgrade_service(DBusConnection *conn,
 
        downgrade_state(service);
        __connman_connection_update_gateway();
+       start_online_check(service, CONNMAN_IPCONFIG_TYPE_IPV4);
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -7529,7 +7593,10 @@ static const GDBusMethodTable service_methods[] = {
                        GDBUS_ARGS({ "service", "o" }), NULL,
                        move_after) },
        { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
-#if defined TIZEN_MAINTAIN_ONLINE
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       { GDBUS_METHOD("IsEapolEnabled", NULL, GDBUS_ARGS({ "eapol", "b" }), is_eapol_enabled) },
+#endif
+#if defined TIZEN_EXT
        { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) },
 #endif
        { },
@@ -7804,7 +7871,7 @@ void connman_service_unref_debug(struct connman_service *service,
        g_hash_table_remove(service_hash, service->identifier);
 }
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static int calculate_score_last_user_selection(struct connman_service *service)
 {
        int score = 0;
@@ -7863,6 +7930,9 @@ static int calculate_score_last_connected(struct connman_service *service)
        unsigned int frequency;
 
        device = connman_network_get_device(service->network);
+       if (!device)
+               return 0;
+
        last_connected_ident = connman_device_get_last_connected_ident(device);
        frequency = connman_network_get_frequency(service->network);
 
@@ -7967,19 +8037,17 @@ static int calculate_score(struct connman_service *service)
                score_frequency + score_security_priority +
                score_internet_connection + score_strength;
 
-#if defined TIZEN_EXT_INS
        service->score_last_user_selection = score_last_user_selection;
        service->score_last_connected = score_last_connected;
        service->score_frequency = score_frequency;
        service->score_security_priority = score_security_priority;
        service->score_internet_connection = score_internet_connection;
        service->score_strength = score_strength;
-#endif
 
        service->ins_score = score;
        return score;
 }
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 static gint service_compare(gconstpointer a, gconstpointer b)
 {
@@ -7987,12 +8055,12 @@ static gint service_compare(gconstpointer a, gconstpointer b)
        struct connman_service *service_b = (void *) b;
        enum connman_service_state state_a, state_b;
        bool a_connected, b_connected;
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
        int score_a;
        int score_b;
-#else
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
        gint strength;
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        state_a = service_a->state;
        state_b = service_b->state;
@@ -8100,21 +8168,21 @@ static gint service_compare(gconstpointer a, gconstpointer b)
                        return 1;
        }
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
        score_a = calculate_score(service_a);
        score_b = calculate_score(service_b);
        if (score_b != score_a)
                return score_b - score_a;
-#else
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
        strength = (gint) service_b->strength - (gint) service_a->strength;
        if (strength)
                return strength;
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        return g_strcmp0(service_a->name, service_b->name);
 }
 
-#if defined TIZEN_EXT_INS
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static void print_service_sort(gpointer data, gpointer user_data)
 {
        struct connman_service *service = data;
@@ -8129,15 +8197,15 @@ static void print_service_sort(gpointer data, gpointer user_data)
                service->score_security_priority, service->score_internet_connection,
                service->score_strength);
 }
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 static void service_list_sort(void)
 {
        if (service_list && service_list->next) {
                service_list = g_list_sort(service_list, service_compare);
-#if defined TIZEN_EXT_INS
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
                g_list_foreach(service_list, print_service_sort, NULL);
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
                service_schedule_changed();
        }
 }
@@ -9349,7 +9417,13 @@ static gboolean redo_wispr_ipv4(gpointer user_data)
 {
        struct connman_service *service = user_data;
 
+#if defined TIZEN_MAINTAIN_ONLINE
+       DBG("");
+
+       __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
        redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#endif
 
        return FALSE;
 }
@@ -9363,19 +9437,6 @@ static gboolean redo_wispr_ipv6(gpointer user_data)
        return FALSE;
 }
 
-#if defined TIZEN_MAINTAIN_ONLINE
-static gboolean redo_wispr_ipv4(gpointer user_data)
-{
-       struct connman_service *service = user_data;
-
-       DBG("");
-
-       __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
-
-       return FALSE;
-}
-#endif
-
 int __connman_service_online_check_failed(struct connman_service *service,
                                        enum connman_ipconfig_type type)
 {
@@ -9920,9 +9981,9 @@ int __connman_service_connect(struct connman_service *service,
        DBG("service %p err %d", service, err);
 
        service->connect_reason = reason;
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
        connect_reason_changed(service);
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        if (err >= 0)
                return 0;
@@ -11067,7 +11128,7 @@ static struct connman_agent_driver agent_driver = {
        .context_unref  = agent_context_unref,
 };
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
 static void ins_setting_init(void)
 {
        int i;
@@ -11153,7 +11214,7 @@ static void ins_setting_init(void)
        DBG("signal_level3_5ghz [%d]", ins_settings.signal_level3_5ghz);
        DBG("signal_level3_24ghz [%d]", ins_settings.signal_level3_24ghz);
 }
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 int __connman_service_init(void)
 {
@@ -11182,9 +11243,9 @@ int __connman_service_init(void)
 
        remove_unprovisioned_services();
 
-#if defined TIZEN_EXT
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
        ins_setting_init();
-#endif
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        return 0;
 }