[tizen 4.0]: Add support of Disconnect Reason Event Handler

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

diff --git a/src/service.c b/src/service.c
index f77f033..e4de9e1 100755 (executable)
--- a/src/service.c
+++ b/src/service.c
@@ -77,7 +77,7 @@ struct connman_service_user {
        uid_t current_user;
 };
 
-#if defined TIZEN_TV_EXT
+#ifdef TIZEN_EXT
 enum connman_dnsconfig_method {
        CONNMAN_DNSCONFIG_METHOD_UNKNOWN = 0,
        CONNMAN_DNSCONFIG_METHOD_MANUAL  = 1,
@@ -165,7 +165,7 @@ struct connman_service {
        char *keymgmt_type;
        int disconnect_reason;
 #endif
-#if defined TIZEN_TV_EXT
+#ifdef TIZEN_EXT
        enum connman_dnsconfig_method dns_config_method;
 #endif
 };
@@ -412,6 +412,8 @@ static const char *error2string(enum connman_service_error error)
                return "auth-failed";
        case CONNMAN_SERVICE_ERROR_INVALID_KEY:
                return "invalid-key";
+       case CONNMAN_SERVICE_ERROR_BLOCKED:
+               return "blocked";
        }
 
        return NULL;
@@ -445,7 +447,7 @@ static enum connman_service_proxy_method string2proxymethod(const char *method)
                return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN;
 }
 
-#if defined TIZEN_TV_EXT
+#ifdef TIZEN_EXT
 static const char *__connman_dnsconfig_method2string(enum connman_dnsconfig_method method)
 {
        switch (method) {
@@ -752,11 +754,13 @@ static int service_load(struct connman_service *service)
                service->nameservers_config = NULL;
        }
 
-#if defined TIZEN_TV_EXT
+#ifdef TIZEN_EXT
        char *dns_method;
-       dns_method = g_key_file_get_string(keyfile, service->identifier,
-                       "Nameservers.method", NULL);
-       service->dns_config_method = __connman_dnsconfig_string2method(dns_method);
+       if (TIZEN_TV_EXT) {
+               dns_method = g_key_file_get_string(keyfile, service->identifier,
+                               "Nameservers.method", NULL);
+               service->dns_config_method = __connman_dnsconfig_string2method(dns_method);
+       }
 #endif
 
        service->timeservers_config = g_key_file_get_string_list(keyfile,
@@ -995,16 +999,18 @@ static int service_save(struct connman_service *service)
        g_key_file_remove_key(keyfile, service->identifier,
                                                        "Nameservers", NULL);
 
-#if defined TIZEN_TV_EXT
-       if(service->dns_config_method != 0) {
-               const char *method;
-               method = __connman_dnsconfig_method2string(
-                               service->dns_config_method);
-               g_key_file_set_string(keyfile, service->identifier,
-                               "Nameservers.method", method);
-       } else
-       g_key_file_remove_key(keyfile, service->identifier,
-                                               "Nameservers.method", NULL);
+#ifdef TIZEN_EXT
+       if (TIZEN_TV_EXT) {
+               if(service->dns_config_method != 0) {
+                       const char *method;
+                       method = __connman_dnsconfig_method2string(
+                                       service->dns_config_method);
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "Nameservers.method", method);
+               } else
+               g_key_file_remove_key(keyfile, service->identifier,
+                                                       "Nameservers.method", NULL);
+       }
 #endif
 
        if (service->timeservers_config) {
@@ -1491,8 +1497,9 @@ int __connman_service_nameserver_append(struct connman_service *service,
 
        nameservers[len + 1] = NULL;
 
-#if defined TIZEN_TV_EXT
-       if(service->dns_config_method == CONNMAN_DNSCONFIG_METHOD_UNKNOWN)
+#ifdef TIZEN_EXT
+       if(TIZEN_TV_EXT &&
+          service->dns_config_method == CONNMAN_DNSCONFIG_METHOD_UNKNOWN)
                service->dns_config_method = CONNMAN_DNSCONFIG_METHOD_DHCP;
 #endif
 
@@ -2112,13 +2119,15 @@ static void append_dns(DBusMessageIter *iter, void *user_data)
        if (!is_connected(service))
                return;
 
-#if defined TIZEN_TV_EXT
-       /* Append DNS Config Type */
+#ifdef TIZEN_EXT
        const char *str;
-       str = __connman_dnsconfig_method2string(service->dns_config_method);
-       if(str != NULL)
-               dbus_message_iter_append_basic(iter,
-                       DBUS_TYPE_STRING, &str);
+       if (TIZEN_TV_EXT) {
+               /* Append DNS Config Type */
+               str = __connman_dnsconfig_method2string(service->dns_config_method);
+               if(str != NULL)
+                       dbus_message_iter_append_basic(iter,
+                               DBUS_TYPE_STRING, &str);
+       }
 #endif
 
        if (service->nameservers_config) {
@@ -2149,13 +2158,15 @@ static void append_dnsconfig(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
 
-#if defined TIZEN_TV_EXT
+#ifdef TIZEN_EXT
        /* Append DNS Config Type */
        const char *str;
-       str = __connman_dnsconfig_method2string(service->dns_config_method);
-       if(str != NULL)
-               dbus_message_iter_append_basic(iter,
-                       DBUS_TYPE_STRING, &str);
+       if (TIZEN_TV_EXT) {
+               str = __connman_dnsconfig_method2string(service->dns_config_method);
+               if(str != NULL)
+                       dbus_message_iter_append_basic(iter,
+                               DBUS_TYPE_STRING, &str);
+       }
 #endif
 
        if (!service->nameservers_config)
@@ -2794,11 +2805,13 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_dbus_dict_append_basic(dict, "State",
                                                DBUS_TYPE_STRING, &str);
 
-#if defined TIZEN_TV_EXT
-       str = state2string(service->state_ipv6);
-       if (str != NULL)
-               connman_dbus_dict_append_basic(dict, "StateIPv6",
-                                               DBUS_TYPE_STRING, &str);
+#ifdef TIZEN_EXT
+       if (TIZEN_TV_EXT) {
+               str = state2string(service->state_ipv6);
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "StateIPv6",
+                                                       DBUS_TYPE_STRING, &str);
+       }
 #endif
 
        str = error2string(service->error);
@@ -2854,7 +2867,7 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                                                append_ethernet, service);
 
                connman_dbus_dict_append_basic(dict, "DisconnectReason",
-                               DBUS_TYPE_INT32, &service->disconnect_reason);
+                               DBUS_TYPE_UINT32, &service->disconnect_reason);
 
                break;
 #endif
@@ -3854,16 +3867,18 @@ static DBusMessage *set_property(DBusConnection *conn,
                        const char *val;
                        dbus_message_iter_get_basic(&entry, &val);
                        dbus_message_iter_next(&entry);
-#if defined TIZEN_TV_EXT
-                       /* First unpack the DNS Config Method */
-                       if(g_strcmp0(val, "manual") == 0) {
-                               service->dns_config_method =
-                                       CONNMAN_DNSCONFIG_METHOD_MANUAL;
-                               continue;
-                       } else if(g_strcmp0(val, "dhcp") == 0) {
-                               service->dns_config_method =
-                                       CONNMAN_DNSCONFIG_METHOD_DHCP;
-                               continue;
+#ifdef TIZEN_EXT
+                       if (TIZEN_TV_EXT) {
+                               /* First unpack the DNS Config Method */
+                               if(g_strcmp0(val, "manual") == 0) {
+                                       service->dns_config_method =
+                                               CONNMAN_DNSCONFIG_METHOD_MANUAL;
+                                       continue;
+                               } else if(g_strcmp0(val, "dhcp") == 0) {
+                                       service->dns_config_method =
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP;
+                                       continue;
+                               }
                        }
 #endif
                        if (connman_inet_check_ipaddress(val) > 0) {
@@ -4040,9 +4055,11 @@ static DBusMessage *set_property(DBusConnection *conn,
                if (err < 0) {
                        if (is_connected_state(service, state) ||
                                        is_connecting_state(service, state)) {
-                               __connman_network_enable_ipconfig(service->network,
+                               if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                                       __connman_network_enable_ipconfig(service->network,
                                                        service->ipconfig_ipv4);
-                               __connman_network_enable_ipconfig(service->network,
+                               else
+                                       __connman_network_enable_ipconfig(service->network,
                                                        service->ipconfig_ipv6);
                        }
 
@@ -4055,10 +4072,12 @@ static DBusMessage *set_property(DBusConnection *conn,
                        ipv6_configuration_changed(service);
 
                if (is_connecting(service) || is_connected(service)) {
-                       __connman_network_enable_ipconfig(service->network,
-                                                       service->ipconfig_ipv4);
-                       __connman_network_enable_ipconfig(service->network,
-                                                       service->ipconfig_ipv6);
+                       if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                               __connman_network_enable_ipconfig(service->network,
+                                                               service->ipconfig_ipv4);
+                       else
+                               __connman_network_enable_ipconfig(service->network,
+                                                               service->ipconfig_ipv6);
                }
 
                service_save(service);
@@ -4081,8 +4100,10 @@ static void set_error(struct connman_service *service,
        if (!service->path)
                return;
 
+#if !defined TIZEN_EXT
        if (!allow_property_changed(service))
                return;
+#endif
 
        str = error2string(service->error);
 
@@ -4615,8 +4636,12 @@ static DBusMessage *connect_service(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
        struct connman_service *service = user_data;
+#if defined TIZEN_EXT
+       int err = 0;
+#else
        int index, err = 0;
        GList *list;
+#endif
 
        DBG("service %p", service);
 
@@ -4656,6 +4681,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
                }
        }
 
+#if !defined TIZEN_EXT
        index = __connman_service_get_index(service);
 
        for (list = service_list; list; list = list->next) {
@@ -4681,6 +4707,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
        }
        if (err == -EINPROGRESS)
                return __connman_error_operation_timeout(msg);
+#endif
 
        service->ignore = false;
 
@@ -4777,9 +4804,11 @@ bool __connman_service_remove(struct connman_service *service)
                        __connman_provider_is_immutable(service->provider))
                return false;
 
+#if !defined TIZEN_EXT
        if (!service->favorite && service->state !=
                                                CONNMAN_SERVICE_STATE_FAILURE)
                return false;
+#endif
 
        __connman_service_disconnect(service);
 
@@ -5998,34 +6027,6 @@ static int check_wpspin(struct connman_service *service, const char *wpspin)
        return 0;
 }
 
-#if defined TIZEN_EXT
-static int __connman_service_connect_hidden(struct connman_service *service,
-                       const char *name, int name_len,
-                       const char *identity, const char *passphrase, void *user_data)
-{
-       GList *list;
-
-       for (list = service_list; list; list = list->next) {
-               struct connman_service *target = list->data;
-               const char *target_ssid = NULL;
-               unsigned int target_ssid_len = 0;
-
-               if (service->network != NULL &&
-                                       service->security == target->security) {
-                       target_ssid = connman_network_get_blob(service->network,
-                                                       "WiFi.SSID", &target_ssid_len);
-                       if (target_ssid_len == name_len &&
-                                                       memcmp(target_ssid, name, name_len) == 0) {
-                               return connman_network_connect_hidden(service->network,
-                                                       (char *)identity, (char *)passphrase, user_data);
-                       }
-               }
-       }
-
-       return -ENOENT;
-}
-#endif
-
 static void request_input_cb(struct connman_service *service,
                        bool values_received,
                        const char *name, int name_len,
@@ -6058,14 +6059,6 @@ static void request_input_cb(struct connman_service *service,
        }
 
        if (service->hidden && name_len > 0 && name_len <= 32) {
-#if defined TIZEN_EXT
-               /* TIZEN already has Wi-Fi hidden scan before this hidden connection */
-               err = __connman_service_connect_hidden(service, name, name_len,
-                                               identity, passphrase, user_data);
-               if (err == 0 || err == -EALREADY || err == -EINPROGRESS)
-                       return;
-#endif
-
                device = connman_network_get_device(service->network);
                security = connman_network_get_string(service->network,
                                                        "WiFi.Security");
@@ -6559,6 +6552,7 @@ static int service_indicate_state(struct connman_service *service)
 #if defined TIZEN_EXT
                if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
                        service->order = 5;
+               __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
 #endif
                if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER &&
                        connman_agent_report_error(service, service->path,
@@ -7061,6 +7055,33 @@ static int service_connect(struct connman_service *service)
        if (service->hidden)
                return -EPERM;
 
+#if defined TIZEN_EXT
+       GList *list;
+       int index;
+
+       index = __connman_service_get_index(service);
+
+       for (list = service_list; list; list = list->next) {
+               struct connman_service *temp = list->data;
+
+               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+                       break;
+
+               if (!is_connecting(temp) && !is_connected(temp))
+                       break;
+
+               if (service == temp)
+                       continue;
+
+               if (service->type != temp->type)
+                       continue;
+
+               if (__connman_service_get_index(temp) == index &&
+                               __connman_service_disconnect(temp) == -EINPROGRESS)
+                       return -EINPROGRESS;
+       }
+#endif
+
        switch (service->type) {
        case CONNMAN_SERVICE_TYPE_UNKNOWN:
        case CONNMAN_SERVICE_TYPE_SYSTEM: