Enable Downgrade dbus method.

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

diff --git a/src/service.c b/src/service.c
index 55bb5f6..36379b2 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -813,7 +813,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 +1835,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 +1859,7 @@ static void __connman_manage_saved_profiles()
        }
 
        g_sequence_free(profile_list);
+       g_strfreev(services);
 }
 #endif
 
@@ -2921,6 +2924,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)
@@ -4968,7 +4996,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;
@@ -7483,7 +7511,7 @@ static DBusMessage *is_eapol_enabled(DBusConnection *conn,
 }
 #endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 
-#if defined TIZEN_MAINTAIN_ONLINE
+#if defined TIZEN_EXT
 static DBusMessage *downgrade_service(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -7491,6 +7519,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);
 }
@@ -7563,7 +7592,7 @@ static const GDBusMethodTable service_methods[] = {
 #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_MAINTAIN_ONLINE
+#if defined TIZEN_EXT
        { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) },
 #endif
        { },
@@ -7897,6 +7926,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);
 
@@ -9383,7 +9415,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;
 }
@@ -9397,19 +9435,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)
 {