Merge "Do not listen all of 53 ports for DNS proxy" into tizen
[platform/upstream/connman.git] / src / service.c
old mode 100644 (file)
new mode 100755 (executable)
index 55cf02c..f561170
@@ -77,6 +77,14 @@ struct connman_service_user {
        uid_t current_user;
 };
 
+#ifdef TIZEN_EXT
+enum connman_dnsconfig_method {
+       CONNMAN_DNSCONFIG_METHOD_UNKNOWN = 0,
+       CONNMAN_DNSCONFIG_METHOD_MANUAL  = 1,
+       CONNMAN_DNSCONFIG_METHOD_DHCP    = 2,
+};
+#endif
+
 struct connman_service {
        int refcount;
        char *identifier;
@@ -140,6 +148,26 @@ struct connman_service {
        bool hidden_service;
        char *config_file;
        char *config_entry;
+#if defined TIZEN_EXT
+       /*
+        * Description: TIZEN implements system global connection management.
+        *              It's only for PDP (cellular) bearer. Wi-Fi is managed
+        *              by ConnMan automatically. Reference count can help to
+        *              manage open/close connection requests by each application.
+        */
+       int user_pdn_connection_refcount;
+       bool storage_reload;
+       /*
+        * Description: In case of EAP security type,
+        *                                user can select the keymgmt type for roaming(802.11r).
+        *                                - FT, CCKM, OKC, ...
+        */
+       char *keymgmt_type;
+       int disconnect_reason;
+#endif
+#ifdef TIZEN_EXT
+       enum connman_dnsconfig_method dns_config_method;
+#endif
 };
 
 static bool allow_property_changed(struct connman_service *service);
@@ -155,6 +183,50 @@ struct find_data {
        struct connman_service *service;
 };
 
+#if defined TIZEN_EXT
+/*
+ * Public APIs to use user_pdn_connection_refcount
+ */
+void connman_service_user_pdn_connection_ref(struct connman_service *service)
+{
+       __sync_fetch_and_add(&service->user_pdn_connection_refcount, 1);
+
+       DBG("User made PDN connection referenced: %d",
+                               service->user_pdn_connection_refcount);
+}
+
+gboolean connman_service_user_pdn_connection_unref_and_test(
+                                       struct connman_service *service)
+{
+       __sync_synchronize();
+
+       DBG("User made PDN connection referenced: %d, which will be decreased",
+                               service->user_pdn_connection_refcount);
+
+       if (service->user_pdn_connection_refcount < 1)
+               return TRUE;
+
+       if (__sync_sub_and_fetch(&service->user_pdn_connection_refcount, 1) == 0)
+               return TRUE;
+
+       return FALSE;
+}
+
+gboolean connman_service_is_no_ref_user_pdn_connection(
+                                       struct connman_service *cellular)
+{
+       if (cellular == NULL)
+               return TRUE;
+
+       __sync_synchronize();
+       if (cellular->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                       cellular->user_pdn_connection_refcount == 0)
+               return TRUE;
+
+       return FALSE;
+}
+#endif
+
 static void compare_path(gpointer value, gpointer user_data)
 {
        struct connman_service *service = value;
@@ -263,6 +335,10 @@ enum connman_service_security __connman_service_string2security(const char *str)
                return CONNMAN_SERVICE_SECURITY_NONE;
        if (!strcmp(str, "wep"))
                return CONNMAN_SERVICE_SECURITY_WEP;
+#if defined TIZEN_EXT
+       if (!strcmp(str, "rsn"))
+               return CONNMAN_SERVICE_SECURITY_RSN;
+#endif
 
        return CONNMAN_SERVICE_SECURITY_UNKNOWN;
 }
@@ -278,8 +354,14 @@ static const char *security2string(enum connman_service_security security)
                return "wep";
        case CONNMAN_SERVICE_SECURITY_PSK:
        case CONNMAN_SERVICE_SECURITY_WPA:
+#if defined TIZEN_EXT
+               return "psk";
+       case CONNMAN_SERVICE_SECURITY_RSN:
+               return "rsn";
+#else
        case CONNMAN_SERVICE_SECURITY_RSN:
                return "psk";
+#endif
        case CONNMAN_SERVICE_SECURITY_8021X:
                return "ieee8021x";
        }
@@ -330,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;
@@ -363,6 +447,33 @@ static enum connman_service_proxy_method string2proxymethod(const char *method)
                return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN;
 }
 
+#ifdef TIZEN_EXT
+static const char *__connman_dnsconfig_method2string(enum connman_dnsconfig_method method)
+{
+       switch (method) {
+       case CONNMAN_DNSCONFIG_METHOD_UNKNOWN:
+               return "unknown";
+       case CONNMAN_DNSCONFIG_METHOD_MANUAL:
+               return "manual";
+       case CONNMAN_DNSCONFIG_METHOD_DHCP:
+               return "dhcp";
+       }
+
+       return NULL;
+}
+
+static enum connman_dnsconfig_method __connman_dnsconfig_string2method(
+               const char *method)
+{
+       if (g_strcmp0(method, "manual") == 0)
+               return CONNMAN_DNSCONFIG_METHOD_MANUAL;
+       else if (g_strcmp0(method, "dhcp") == 0)
+               return CONNMAN_DNSCONFIG_METHOD_DHCP;
+       else
+               return CONNMAN_DNSCONFIG_METHOD_UNKNOWN;
+}
+#endif
+
 static bool
 connman_service_is_user_allowed(struct connman_service *service, uid_t uid)
 {
@@ -381,6 +492,7 @@ connman_service_is_user_allowed(struct connman_service *service, uid_t uid)
        return true;
 }
 
+#if !defined TIZEN_EXT
 static GList *connman_service_get_login_users()
 {
        struct utmpx *utmp;
@@ -390,25 +502,29 @@ static GList *connman_service_get_login_users()
        setutxent();
 
        while ((utmp = getutxent()) != NULL) {
-               if (utmp->ut_user != USER_ROOT && utmp->ut_type != USER_PROCESS)
-                       continue;
+               DBG("User Name: %s", utmp->ut_user);
 
                pwd = getpwnam(utmp->ut_user);
-
-               if (!g_list_find(user_list, GUINT_TO_POINTER(pwd->pw_uid)))
-                       user_list = g_list_append(user_list,
+               if (pwd) {
+                       if (!g_list_find(user_list, GUINT_TO_POINTER(pwd->pw_uid)))
+                               user_list = g_list_append(user_list,
                                                GUINT_TO_POINTER(pwd->pw_uid));
 
-               DBG("User Name: %s, UID: %d", utmp->ut_user, pwd->pw_uid);
+                       DBG("User Name: %s, UID: %d", utmp->ut_user, pwd->pw_uid);
+               }
        }
 
        endutxent();
 
        return user_list;
 }
+#endif
 
 static bool is_service_owner_user_login(struct connman_service *service)
 {
+#if defined TIZEN_EXT
+       return true;
+#else
        GList *list, *user_list;
        bool ret = false;
 
@@ -416,10 +532,14 @@ static bool is_service_owner_user_login(struct connman_service *service)
        if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
                return true;
 
-       user_list = connman_service_get_login_users();
-
        DBG("service favorite user id is: %d", service->user.favorite_user);
 
+       user_list = connman_service_get_login_users();
+       if (user_list == NULL) {
+               DBG("Can not get any logged in user info.");
+               return true;
+       }
+
        for (list = user_list; list; list = list->next) {
                uid_t uid = GPOINTER_TO_UINT(list->data);
 
@@ -434,6 +554,7 @@ static bool is_service_owner_user_login(struct connman_service *service)
        g_list_free(user_list);
 
        return ret;
+#endif
 }
 
 int __connman_service_load_modifiable(struct connman_service *service)
@@ -484,6 +605,23 @@ int __connman_service_load_modifiable(struct connman_service *service)
        return 0;
 }
 
+static int service_load_passphrase(struct connman_service *service)
+{
+       GKeyFile *keyfile;
+       gchar *str;
+
+       keyfile = connman_storage_load_service(service->identifier);
+       if (!keyfile)
+               return -EIO;
+
+       str = g_key_file_get_string(keyfile,
+                               service->identifier, "Passphrase", NULL);
+       if (str)
+               service->passphrase = str;
+
+       return 0;
+}
+
 static int service_load(struct connman_service *service)
 {
        GKeyFile *keyfile;
@@ -562,6 +700,8 @@ static int service_load(struct connman_service *service)
 
                                connman_network_set_blob(service->network,
                                        "WiFi.SSID", ssid, hex_ssid_len / 2);
+
+                               g_free(ssid);
                        }
 
                        g_free(hex_ssid);
@@ -614,6 +754,15 @@ static int service_load(struct connman_service *service)
                service->nameservers_config = NULL;
        }
 
+#ifdef TIZEN_EXT
+       char *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,
                        service->identifier, "Timeservers", &length, NULL);
        if (service->timeservers_config && length == 0) {
@@ -659,7 +808,62 @@ static int service_load(struct connman_service *service)
        service->hidden_service = g_key_file_get_boolean(keyfile,
                                        service->identifier, "Hidden", NULL);
 
-       service->user.favorite_user = g_key_file_get_integer(keyfile,
+#if defined TIZEN_EXT
+       if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service->security == CONNMAN_SERVICE_SECURITY_8021X) {
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "EAP", NULL);
+               if (str != NULL) {
+                       g_free(service->eap);
+                       service->eap = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "Phase2", NULL);
+               if (str != NULL) {
+                       g_free(service->phase2);
+                       service->phase2 = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "Identity", NULL);
+               if (str != NULL) {
+                       g_free(service->identity);
+                       service->identity = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "CACertFile", NULL);
+               if (str != NULL) {
+                       g_free(service->ca_cert_file);
+                       service->ca_cert_file = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "ClientCertFile", NULL);
+               if (str != NULL) {
+                       g_free(service->client_cert_file);
+                       service->client_cert_file = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "PrivateKeyFile", NULL);
+               if (str != NULL) {
+                       g_free(service->private_key_file);
+                       service->private_key_file = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "PrivateKeyPassphrase", NULL);
+               if (str != NULL) {
+                       g_free(service->private_key_passphrase);
+                       service->private_key_passphrase = str;
+               }
+       }
+#endif
+
+       if (g_key_file_has_key(keyfile, service->identifier, "UID", NULL))
+               service->user.favorite_user = g_key_file_get_integer(keyfile,
                                        service->identifier, "UID", NULL);
 done:
        g_key_file_free(keyfile);
@@ -706,8 +910,12 @@ static int service_save(struct connman_service *service)
                        const unsigned char *ssid;
                        unsigned int ssid_len = 0;
 
-                       g_key_file_set_integer(keyfile, service->identifier,
-                               "UID", service->user.favorite_user);
+                       if (service->user.favorite_user == USER_NONE)
+                               g_key_file_remove_key(keyfile, service->identifier,
+                                                       "UID", NULL);
+                       else
+                               g_key_file_set_integer(keyfile, service->identifier,
+                                                       "UID", service->user.favorite_user);
 
                        ssid = connman_network_get_blob(service->network,
                                                        "WiFi.SSID", &ssid_len);
@@ -764,12 +972,14 @@ static int service_save(struct connman_service *service)
                g_free(str);
        }
 
-       if (service->passphrase && strlen(service->passphrase) > 0)
-               g_key_file_set_string(keyfile, service->identifier,
+       if (service->user.current_user == service->user.favorite_user) {
+               if (service->passphrase && strlen(service->passphrase) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
                                        "Passphrase", service->passphrase);
-       else
-               g_key_file_remove_key(keyfile, service->identifier,
-                                                       "Passphrase", NULL);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "Passphrase", NULL);
+       }
 
        if (service->ipconfig_ipv4)
                __connman_ipconfig_save(service->ipconfig_ipv4, keyfile,
@@ -789,6 +999,20 @@ static int service_save(struct connman_service *service)
        g_key_file_remove_key(keyfile, service->identifier,
                                                        "Nameservers", 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) {
                guint len = g_strv_length(service->timeservers_config);
 
@@ -854,6 +1078,60 @@ static int service_save(struct connman_service *service)
                g_key_file_set_string(keyfile, service->identifier,
                                "Config.ident", service->config_entry);
 
+#if defined TIZEN_EXT
+       if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service->security == CONNMAN_SERVICE_SECURITY_8021X) {
+               if (service->eap != NULL && strlen(service->eap) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "EAP", service->eap);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "EAP", NULL);
+
+               if (service->phase2 != NULL && strlen(service->phase2) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "Phase2", service->phase2);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "Phase2", NULL);
+
+               if (service->identity != NULL && strlen(service->identity) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "Identity", service->identity);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "Identity", NULL);
+
+               if (service->ca_cert_file != NULL && strlen(service->ca_cert_file) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "CACertFile", service->ca_cert_file);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "CACertFile", NULL);
+
+               if (service->client_cert_file != NULL && strlen(service->client_cert_file) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "ClientCertFile", service->client_cert_file);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "ClientCertFile", NULL);
+
+               if (service->private_key_file != NULL && strlen(service->private_key_file) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "PrivateKeyFile", service->private_key_file);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "PrivateKeyFile", NULL);
+
+               if (service->private_key_passphrase != NULL && strlen(service->private_key_passphrase) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "PrivateKeyPassphrase", service->private_key_passphrase);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "PrivateKeyPassphrase", NULL);
+       }
+#endif
+
 done:
        __connman_storage_save_service(keyfile, service->identifier);
 
@@ -1026,146 +1304,155 @@ static bool is_connected(struct connman_service *service)
        return is_connected_state(service, service->state);
 }
 
-static int nameserver_get_index(struct connman_service *service)
+static bool nameserver_available(struct connman_service *service,
+                               const char *ns)
 {
-       switch (combine_state(service->state_ipv4, service->state_ipv6)) {
-       case CONNMAN_SERVICE_STATE_UNKNOWN:
-       case CONNMAN_SERVICE_STATE_IDLE:
-       case CONNMAN_SERVICE_STATE_ASSOCIATION:
-       case CONNMAN_SERVICE_STATE_CONFIGURATION:
-       case CONNMAN_SERVICE_STATE_FAILURE:
-       case CONNMAN_SERVICE_STATE_DISCONNECT:
-               return -1;
-       case CONNMAN_SERVICE_STATE_READY:
-       case CONNMAN_SERVICE_STATE_ONLINE:
-               break;
-       }
+       int family;
+
+       family = connman_inet_check_ipaddress(ns);
+
+       if (family == AF_INET)
+               return is_connected_state(service, service->state_ipv4);
 
-       return __connman_service_get_index(service);
+       if (family == AF_INET6)
+               return is_connected_state(service, service->state_ipv6);
+
+       return false;
 }
 
-static void remove_nameservers(struct connman_service *service,
-               int index, char **ns)
+static int nameserver_add(struct connman_service *service,
+                       const char *nameserver)
 {
-       int i;
-
-       if (!ns)
-               return;
+       int index;
 
-       if (index < 0)
-               index = nameserver_get_index(service);
+       if (!nameserver_available(service, nameserver))
+               return 0;
 
+       index = __connman_service_get_index(service);
        if (index < 0)
-                       return;
+               return -ENXIO;
 
-       for (i = 0; ns[i]; i++)
-               connman_resolver_remove(index, NULL, ns[i]);
+       return connman_resolver_append(index, NULL, nameserver);
 }
 
-static void remove_searchdomains(struct connman_service *service,
-               int index, char **sd)
+static int nameserver_add_all(struct connman_service *service)
 {
-       int i;
+       int i = 0;
 
-       if (!sd)
-               return;
+       if (service->nameservers_config) {
+               while (service->nameservers_config[i]) {
+                       nameserver_add(service, service->nameservers_config[i]);
+                       i++;
+               }
 
-       if (index < 0)
-               index = nameserver_get_index(service);
+               return 0;
+       }
 
-       if (index < 0)
-               return;
+       if (service->nameservers) {
+               while (service->nameservers[i]) {
+                       nameserver_add(service, service->nameservers[i]);
+                       i++;
+               }
+       }
 
-       for (i = 0; sd[i]; i++)
-               connman_resolver_remove(index, sd[i], NULL);
+       return 0;
 }
 
-static bool nameserver_available(struct connman_service *service, char *ns)
+static int nameserver_remove(struct connman_service *service,
+                       const char *nameserver)
 {
-       int family;
-
-       family = connman_inet_check_ipaddress(ns);
+       int index;
 
-       if (family == AF_INET)
-               return is_connected_state(service, service->state_ipv4);
+       if (!nameserver_available(service, nameserver))
+               return 0;
 
-       if (family == AF_INET6)
-               return is_connected_state(service, service->state_ipv6);
+       index = __connman_service_get_index(service);
+       if (index < 0)
+               return -ENXIO;
 
-       return false;
+       return connman_resolver_remove(index, NULL, nameserver);
 }
 
-static void update_nameservers(struct connman_service *service)
+static int nameserver_remove_all(struct connman_service *service)
 {
-       int index;
-       char *ns;
+#if defined TIZEN_EXT
+       /**
+         * Skip this function if there is any connected profiles
+         * that use same interface
+         */
+       if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                       __connman_service_get_connected_count_of_iface(service) > 0)
+               return 0;
+#endif
+       int index, i = 0;
 
        index = __connman_service_get_index(service);
        if (index < 0)
-               return;
+               return -ENXIO;
 
-       switch (combine_state(service->state_ipv4, service->state_ipv6)) {
-       case CONNMAN_SERVICE_STATE_UNKNOWN:
-       case CONNMAN_SERVICE_STATE_IDLE:
-       case CONNMAN_SERVICE_STATE_ASSOCIATION:
-       case CONNMAN_SERVICE_STATE_CONFIGURATION:
-               return;
-       case CONNMAN_SERVICE_STATE_FAILURE:
-       case CONNMAN_SERVICE_STATE_DISCONNECT:
-               connman_resolver_remove_all(index);
-               return;
-       case CONNMAN_SERVICE_STATE_READY:
-       case CONNMAN_SERVICE_STATE_ONLINE:
-               break;
+       while (service->nameservers_config && service->nameservers_config[i]) {
+
+               nameserver_remove(service, service->nameservers_config[i]);
+               i++;
        }
 
-       if (service->nameservers_config) {
-               int i;
+       i = 0;
+       while (service->nameservers && service->nameservers[i]) {
+               nameserver_remove(service, service->nameservers[i]);
+               i++;
+       }
 
-               remove_nameservers(service, index, service->nameservers);
+       return 0;
+}
 
-               i = g_strv_length(service->nameservers_config);
-               while (i != 0) {
-                       i--;
+static int searchdomain_add_all(struct connman_service *service)
+{
+       int index, i = 0;
 
-                       ns = service->nameservers_config[i];
+       if (!is_connected(service))
+               return -ENOTCONN;
 
-                       if (nameserver_available(service, ns))
-                               connman_resolver_append(index, NULL, ns);
+       index = __connman_service_get_index(service);
+       if (index < 0)
+               return -ENXIO;
+
+       if (service->domains) {
+               while (service->domains[i]) {
+                       connman_resolver_append(index, service->domains[i],
+                                               NULL);
+                       i++;
                }
-       } else if (service->nameservers) {
-               int i;
 
-               remove_nameservers(service, index, service->nameservers);
+               return 0;
+       }
 
-               i = g_strv_length(service->nameservers);
-               while (i != 0) {
-                       i--;
+       if (service->domainname)
+               connman_resolver_append(index, service->domainname, NULL);
 
-                       ns = service->nameservers[i];
+       return 0;
 
-                       if (nameserver_available(service, ns))
-                               connman_resolver_append(index, NULL, ns);
-               }
-       }
+}
 
-       if (service->domains) {
-               char *searchdomains[2] = {NULL, NULL};
-               int i;
+static int searchdomain_remove_all(struct connman_service *service)
+{
+       int index, i = 0;
 
-               searchdomains[0] = service->domainname;
-               remove_searchdomains(service, index, searchdomains);
+       if (!is_connected(service))
+               return -ENOTCONN;
 
-               i = g_strv_length(service->domains);
-               while (i != 0) {
-                       i--;
-                       connman_resolver_append(index, service->domains[i],
-                                               NULL);
-               }
-       } else if (service->domainname)
-               connman_resolver_append(index, service->domainname, NULL);
+       index = __connman_service_get_index(service);
+       if (index < 0)
+               return -ENXIO;
+
+       while (service->domains && service->domains[i]) {
+               connman_resolver_remove(index, service->domains[i], NULL);
+               i++;
+       }
 
-       connman_resolver_flush();
+       if (service->domainname)
+               connman_resolver_remove(index, service->domainname, NULL);
+
+       return 0;
 }
 
 /*
@@ -1210,11 +1497,17 @@ int __connman_service_nameserver_append(struct connman_service *service,
 
        nameservers[len + 1] = NULL;
 
+#ifdef TIZEN_EXT
+       if(TIZEN_TV_EXT &&
+          service->dns_config_method == CONNMAN_DNSCONFIG_METHOD_UNKNOWN)
+               service->dns_config_method = CONNMAN_DNSCONFIG_METHOD_DHCP;
+#endif
+
        if (is_auto) {
                service->nameservers_auto = nameservers;
        } else {
                service->nameservers = nameservers;
-               update_nameservers(service);
+               nameserver_add(service, nameserver);
        }
 
        return 0;
@@ -1252,13 +1545,8 @@ int __connman_service_nameserver_remove(struct connman_service *service,
        len = g_strv_length(nameservers);
 
        if (len == 1) {
-               g_strfreev(nameservers);
-               if (is_auto)
-                       service->nameservers_auto = NULL;
-               else
-                       service->nameservers = NULL;
-
-               return 0;
+               servers = NULL;
+               goto set_servers;
        }
 
        servers = g_try_new0(char *, len);
@@ -1266,15 +1554,17 @@ int __connman_service_nameserver_remove(struct connman_service *service,
                return -ENOMEM;
 
        for (i = 0, j = 0; i < len; i++) {
-               if (g_strcmp0(nameservers[i], nameserver) != 0) {
-                       servers[j] = g_strdup(nameservers[i]);
-                       if (!servers[j])
-                               return -ENOMEM;
+               if (g_strcmp0(nameservers[i], nameserver)) {
+                       servers[j] = nameservers[i];
                        j++;
-               }
+               } else
+                       g_free(nameservers[i]);
+
+               nameservers[i] = NULL;
        }
        servers[len - 1] = NULL;
 
+set_servers:
        g_strfreev(nameservers);
        nameservers = servers;
 
@@ -1282,7 +1572,7 @@ int __connman_service_nameserver_remove(struct connman_service *service,
                service->nameservers_auto = nameservers;
        } else {
                service->nameservers = nameservers;
-               update_nameservers(service);
+               nameserver_remove(service, nameserver);
        }
 
        return 0;
@@ -1290,10 +1580,12 @@ int __connman_service_nameserver_remove(struct connman_service *service,
 
 void __connman_service_nameserver_clear(struct connman_service *service)
 {
+       nameserver_remove_all(service);
+
        g_strfreev(service->nameservers);
        service->nameservers = NULL;
 
-       update_nameservers(service);
+       nameserver_add_all(service);
 }
 
 static void add_nameserver_route(int family, int index, char *nameserver,
@@ -1321,14 +1613,18 @@ static void add_nameserver_route(int family, int index, char *nameserver,
 static void nameserver_add_routes(int index, char **nameservers,
                                        const char *gw)
 {
-       int i, family;
+       int i, ns_family, gw_family;
+
+       gw_family = connman_inet_check_ipaddress(gw);
+       if (gw_family < 0)
+               return;
 
        for (i = 0; nameservers[i]; i++) {
-               family = connman_inet_check_ipaddress(nameservers[i]);
-               if (family < 0)
+               ns_family = connman_inet_check_ipaddress(nameservers[i]);
+               if (ns_family < 0 || ns_family != gw_family)
                        continue;
 
-               add_nameserver_route(family, index, nameservers[i], gw);
+               add_nameserver_route(ns_family, index, nameservers[i], gw);
        }
 }
 
@@ -1490,6 +1786,71 @@ static void reset_stats(struct connman_service *service)
        g_timer_reset(service->stats_roaming.timer);
 }
 
+#if defined TIZEN_EXT
+static gboolean __connman_service_is_internet_profile(
+               struct connman_service *cellular)
+{
+       const char internet_suffix[] = "_1";
+
+       DBG("Service path: %s", cellular->path);
+
+       if (g_str_has_suffix(cellular->path, internet_suffix) == TRUE)
+               return TRUE;
+
+       return FALSE;
+}
+
+static gboolean __connman_service_is_tethering_profile(
+               struct connman_service *cellular)
+{
+       const char tethering_suffix[] = "_5";
+
+       DBG("Service path: %s", cellular->path);
+
+       if (g_str_has_suffix(cellular->path, tethering_suffix) == TRUE)
+               return TRUE;
+
+       return FALSE;
+}
+
+struct connman_service *connman_service_get_default_connection(void)
+{
+       GList *list;
+       struct connman_service *service;
+       struct connman_service *default_service = NULL;
+
+       for (list = service_list; list; list = list->next) {
+               service = list->data;
+
+               DBG("service: %p %s %s %s", service, service->name,
+                               state2string(service->state),
+                               __connman_service_type2string(service->type));
+
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                               is_connected(service) == TRUE) {
+                       return service;
+               } else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                               __connman_service_is_internet_profile(service) == TRUE) {
+                       if (default_service == NULL)
+                               default_service = service;
+                       else if (is_connected(service) == TRUE &&
+                                       is_connected(default_service) == FALSE)
+                               default_service = service;
+               } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+                               is_connected(service) == TRUE) {
+                       if (default_service == NULL)
+                               default_service = service;
+               } else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+                               is_connected(service) == TRUE) {
+                       if (default_service == NULL)
+                               default_service = service;
+               }
+       }
+
+       return default_service;
+}
+#endif
+
 struct connman_service *__connman_service_get_default(void)
 {
        struct connman_service *service;
@@ -1528,9 +1889,15 @@ static void default_changed(void)
                current_default ? current_default->identifier : "");
        DBG("new default %p %s", service, service ? service->identifier : "");
 
+#if defined TIZEN_EXT
+       current_default = service;
+
+       __connman_service_timeserver_changed(service, NULL);
+#else
        __connman_service_timeserver_changed(current_default, NULL);
 
        current_default = service;
+#endif
 
        if (service) {
                if (service->hostname &&
@@ -1554,8 +1921,10 @@ static void state_changed(struct connman_service *service)
        if (!str)
                return;
 
+#if !defined TIZEN_EXT
        if (!allow_property_changed(service))
                return;
+#endif
 
        connman_dbus_property_changed_basic(service->path,
                                CONNMAN_SERVICE_INTERFACE, "State",
@@ -1750,6 +2119,17 @@ static void append_dns(DBusMessageIter *iter, void *user_data)
        if (!is_connected(service))
                return;
 
+#ifdef TIZEN_EXT
+       const char *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) {
                append_nameservers(iter, service, service->nameservers_config);
                return;
@@ -1778,6 +2158,17 @@ static void append_dnsconfig(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
 
+#ifdef TIZEN_EXT
+       /* Append DNS Config Type */
+       const char *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)
                return;
 
@@ -2354,13 +2745,17 @@ static void append_wifi_ext_info(DBusMessageIter *dict,
        char *bssid_str = bssid_buff;
        unsigned char *bssid;
        unsigned int maxrate;
+       unsigned int keymgmt;
        uint16_t frequency;
        const char *enc_mode;
+       gboolean passpoint;
 
        bssid = connman_network_get_bssid(network);
        maxrate = connman_network_get_maxrate(network);
        frequency = connman_network_get_frequency(network);
        enc_mode = connman_network_get_enc_mode(network);
+       passpoint = connman_network_get_is_hs20AP(network);
+       keymgmt = connman_network_get_keymgmt(network);
 
        snprintf(bssid_str, WIFI_BSSID_STR_LEN, "%02x:%02x:%02x:%02x:%02x:%02x",
                                bssid[0], bssid[1], bssid[2],
@@ -2374,6 +2769,10 @@ static void append_wifi_ext_info(DBusMessageIter *dict,
                                        DBUS_TYPE_UINT16, &frequency);
        connman_dbus_dict_append_basic(dict, "EncryptionMode",
                                        DBUS_TYPE_STRING, &enc_mode);
+       connman_dbus_dict_append_basic(dict, "Passpoint",
+                                       DBUS_TYPE_BOOLEAN, &passpoint);
+       connman_dbus_dict_append_basic(dict, "Keymgmt",
+                                       DBUS_TYPE_UINT32, &keymgmt);
 }
 #endif
 
@@ -2384,6 +2783,15 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
        const char *str;
        GSList *list;
 
+#if defined TIZEN_EXT
+       unsigned int frequency = 0U;
+       if (service && service->network) {
+               frequency = connman_network_get_frequency(service->network);
+               connman_dbus_dict_append_basic(dict, "Frequency",
+                               DBUS_TYPE_UINT16, &frequency);
+       }
+#endif
+
        str = __connman_service_type2string(service->type);
        if (str)
                connman_dbus_dict_append_basic(dict, "Type",
@@ -2397,6 +2805,15 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_dbus_dict_append_basic(dict, "State",
                                                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);
        if (str)
                connman_dbus_dict_append_basic(dict, "Error",
@@ -2448,6 +2865,10 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
 
                connman_dbus_dict_append_dict(dict, "Ethernet",
                                                append_ethernet, service);
+
+               connman_dbus_dict_append_basic(dict, "DisconnectReason",
+                               DBUS_TYPE_INT32, &service->disconnect_reason);
+
                break;
 #endif
        case CONNMAN_SERVICE_TYPE_ETHERNET:
@@ -2682,6 +3103,54 @@ char **connman_service_get_timeservers(struct connman_service *service)
        return service->timeservers;
 }
 
+#if defined TIZEN_EXT
+/*
+ * Description: Telephony plug-in requires manual PROXY setting function
+ */
+int connman_service_set_proxy(struct connman_service *service,
+                                       const char *proxy, gboolean active)
+{
+       char **proxies_array = NULL;
+
+       if (service == NULL)
+               return -EINVAL;
+
+       switch (service->type) {
+       case CONNMAN_SERVICE_TYPE_CELLULAR:
+       case CONNMAN_SERVICE_TYPE_ETHERNET:
+       case CONNMAN_SERVICE_TYPE_WIFI:
+               break;
+
+       default:
+               return -EINVAL;
+       }
+
+       g_strfreev(service->proxies);
+       service->proxies = NULL;
+
+       if (proxy != NULL)
+               proxies_array = g_strsplit(proxy, " ", 0);
+
+       service->proxies = proxies_array;
+
+       if (proxy == NULL) {
+               service->proxy_config = CONNMAN_SERVICE_PROXY_METHOD_DIRECT;
+               DBG("proxy changed (%d)", active);
+       } else {
+               service->proxy_config = CONNMAN_SERVICE_PROXY_METHOD_MANUAL;
+               DBG("proxy chagned %s (%d)", proxy, active);
+       }
+
+       if (active == TRUE) {
+               proxy_changed(service);
+
+               __connman_notifier_proxy_changed(service);
+       }
+
+       return 0;
+}
+#endif
+
 void connman_service_set_proxy_method(struct connman_service *service,
                                        enum connman_service_proxy_method method)
 {
@@ -2956,7 +3425,9 @@ static int check_passphrase(enum connman_service_security security,
        case CONNMAN_SERVICE_SECURITY_UNKNOWN:
        case CONNMAN_SERVICE_SECURITY_NONE:
        case CONNMAN_SERVICE_SECURITY_WPA:
+#if !defined TIZEN_EXT
        case CONNMAN_SERVICE_SECURITY_RSN:
+#endif
 
                DBG("service security '%s' (%d) not handled",
                                security2string(security), security);
@@ -2964,6 +3435,9 @@ static int check_passphrase(enum connman_service_security security,
                return -EOPNOTSUPP;
 
        case CONNMAN_SERVICE_SECURITY_PSK:
+#if defined TIZEN_EXT
+       case CONNMAN_SERVICE_SECURITY_RSN:
+#endif
                /* A raw key is always 64 bytes length,
                 * its content is in hex representation.
                 * A PSK key must be between [8..63].
@@ -3019,7 +3493,6 @@ int __connman_service_set_passphrase(struct connman_service *service,
        if (service->network)
                connman_network_set_string(service->network, "WiFi.Passphrase",
                                service->passphrase);
-       service_save(service);
 
        return 0;
 }
@@ -3032,16 +3505,6 @@ const char *__connman_service_get_passphrase(struct connman_service *service)
        return service->passphrase;
 }
 
-static void clear_passphrase(struct connman_service *service)
-{
-       g_free(service->passphrase);
-       service->passphrase = NULL;
-
-       if (service->network)
-               connman_network_set_string(service->network, "WiFi.Passphrase",
-                               service->passphrase);
-}
-
 static DBusMessage *get_properties(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -3404,6 +3867,20 @@ static DBusMessage *set_property(DBusConnection *conn,
                        const char *val;
                        dbus_message_iter_get_basic(&entry, &val);
                        dbus_message_iter_next(&entry);
+#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) {
                                if (str->len > 0)
                                        g_string_append_printf(str, " %s", val);
@@ -3412,7 +3889,7 @@ static DBusMessage *set_property(DBusConnection *conn,
                        }
                }
 
-               remove_nameservers(service, -1, service->nameservers_config);
+               nameserver_remove_all(service);
                g_strfreev(service->nameservers_config);
 
                if (str->len > 0) {
@@ -3427,7 +3904,7 @@ static DBusMessage *set_property(DBusConnection *conn,
                if (gw && strlen(gw))
                        __connman_service_nameserver_add_routes(service, gw);
 
-               update_nameservers(service);
+               nameserver_add_all(service);
                dns_configuration_changed(service);
 
                if (__connman_service_is_connected_state(service,
@@ -3514,7 +3991,7 @@ static DBusMessage *set_property(DBusConnection *conn,
                                g_string_append(str, val);
                }
 
-               remove_searchdomains(service, -1, service->domains);
+               searchdomain_remove_all(service);
                g_strfreev(service->domains);
 
                if (str->len > 0)
@@ -3524,7 +4001,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                g_string_free(str, TRUE);
 
-               update_nameservers(service);
+               searchdomain_add_all(service);
                domain_configuration_changed(service);
                domain_changed(service);
 
@@ -3577,10 +4054,15 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                if (err < 0) {
                        if (is_connected_state(service, state) ||
-                                       is_connecting_state(service, state))
-                               __connman_network_set_ipconfig(service->network,
-                                               service->ipconfig_ipv4,
-                                               service->ipconfig_ipv6);
+                                       is_connecting_state(service, state)) {
+                               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);
+                       }
+
                        return __connman_error_failed(msg, -err);
                }
 
@@ -3589,10 +4071,14 @@ static DBusMessage *set_property(DBusConnection *conn,
                else
                        ipv6_configuration_changed(service);
 
-               if (is_connecting(service) || is_connected(service))
-                       __connman_network_set_ipconfig(service->network,
-                                       service->ipconfig_ipv4,
-                                       service->ipconfig_ipv6);
+               if (is_connecting(service) || is_connected(service)) {
+                       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);
        } else
@@ -3614,19 +4100,29 @@ 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);
 
        if (!str)
                str = "";
 
-       if (!allow_property_changed(service))
-               return;
-
        connman_dbus_property_changed_basic(service->path,
                                CONNMAN_SERVICE_INTERFACE, "Error",
                                DBUS_TYPE_STRING, &str);
 }
 
+static void set_idle(struct connman_service *service)
+{
+       service->state = service->state_ipv4 = service->state_ipv6 =
+                                               CONNMAN_SERVICE_STATE_IDLE;
+       set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+       state_changed(service);
+}
+
 static DBusMessage *clear_property(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -3788,6 +4284,17 @@ static GList *preferred_tech_list_get(void)
                                        CONNMAN_SERVICE_CONNECT_REASON_USER) {
                                DBG("service %p name %s is user connected",
                                                service, service->name);
+#if defined TIZEN_EXT
+                               /* We can connect to a favorite service like
+                                * wifi even we have a userconnect for cellular
+                                * because we have refount for cellular service
+                                */
+                               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+                                       break;
+
+                               if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+                                       break;
+#endif
                                return NULL;
                        }
                }
@@ -3825,6 +4332,20 @@ static bool auto_connect_service(GList *services,
                        continue;
                }
 
+#if defined TIZEN_EXT
+               DBG("service %p %s %s %s, favorite(%d), ignore(%d), hidden(%d, %d)",
+                               service, service->name,
+                               state2string(service->state),
+                               __connman_service_type2string(service->type),
+                               service->favorite, is_ignore(service),
+                               service->hidden, service->hidden_service);
+
+               /* Tizen takes Wi-Fi as the highest priority into consideration. */
+               if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+                       if (is_connecting(service) == TRUE || is_connected(service) == TRUE)
+                               continue;
+#endif
+
                if (service->pending ||
                                is_connecting(service) ||
                                is_connected(service)) {
@@ -3909,7 +4430,23 @@ void __connman_service_auto_connect(enum connman_service_connect_reason reason)
        if (!__connman_session_policy_autoconnect(reason))
                return;
 
+#if defined TIZEN_EXT
+       /* Adding Timeout of 500ms before trying to auto connect.
+        * This is done because of below scenario
+        * 1. Device is connected to AP1
+        * 2. WPS Connection request is initiated for AP2
+        * 3. Immediately WPS Connection is Cancelled
+        * When WPS Connection Connection is initiated for AP2 then
+        * sometimes there is a scenario where connman gets in ASSOCIATED
+        * state with AP1 due to autoconnect and subsequently the connection
+        * initiated by AP1 fails and connman service for AP1 comes in
+        * FAILURE state due to this when connection with AP2 is cancelled
+        * then autoconnect with AP1 doesn't works because its autoconnection
+        * is ignored as its last state was FAILURE rather than IDLE */
+       autoconnect_timeout = g_timeout_add(500, run_auto_connect,
+#else
        autoconnect_timeout = g_timeout_add_seconds(0, run_auto_connect,
+#endif
                                                GUINT_TO_POINTER(reason));
 }
 
@@ -4099,11 +4636,23 @@ 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);
 
+#if defined TIZEN_EXT
+       /*
+        * Description: TIZEN implements system global connection management.
+        */
+       if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+               connman_service_user_pdn_connection_ref(service);
+#endif
+
        if (service->pending)
                return __connman_error_in_progress(msg);
 
@@ -4125,13 +4674,23 @@ static DBusMessage *connect_service(DBusConnection *conn,
                        service->request_passphrase_input = true;
 
                service->user.current_user = uid;
+
+               if (!service->passphrase && uid == service->user.favorite_user) {
+                       DBG("Now load this favorite user's passphrase.");
+                       service_load_passphrase(service);
+               }
        }
 
+#if !defined TIZEN_EXT
        index = __connman_service_get_index(service);
 
        for (list = service_list; list; list = list->next) {
                struct connman_service *temp = list->data;
 
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+                       break;
+#endif
                if (!is_connecting(temp) && !is_connected(temp))
                        break;
 
@@ -4148,6 +4707,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
        }
        if (err == -EINPROGRESS)
                return __connman_error_operation_timeout(msg);
+#endif
 
        service->ignore = false;
 
@@ -4178,6 +4738,20 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
 
        DBG("service %p", service);
 
+#if defined TIZEN_EXT
+       /*
+        * Description: TIZEN implements system global connection management.
+        */
+       if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR) {
+               if (connman_service_user_pdn_connection_unref_and_test(service) != TRUE)
+                       return __connman_error_failed(msg, EISCONN);
+
+               if (is_connected(service) == TRUE &&
+                               service == connman_service_get_default_connection())
+                       return __connman_error_failed(msg, EISCONN);
+       }
+#endif
+
        if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
                uid_t uid;
                if (connman_dbus_get_connection_unix_user_sync(conn,
@@ -4202,6 +4776,24 @@ static DBusMessage *disconnect_service(DBusConnection *conn,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
+#if defined TIZEN_EXT
+static void __connman_service_cleanup_network_8021x(struct connman_service *service)
+{
+       if (service == NULL)
+               return;
+
+       DBG("service %p ", service);
+
+       connman_network_set_string(service->network, "WiFi.EAP", NULL);
+       connman_network_set_string(service->network, "WiFi.Identity", NULL);
+       connman_network_set_string(service->network, "WiFi.CACertFile", NULL);
+       connman_network_set_string(service->network, "WiFi.ClientCertFile", NULL);
+       connman_network_set_string(service->network, "WiFi.PrivateKeyFile", NULL);
+       connman_network_set_string(service->network, "WiFi.PrivateKeyPassphrase", NULL);
+       connman_network_set_string(service->network, "WiFi.Phase2", NULL);
+}
+#endif
+
 bool __connman_service_remove(struct connman_service *service)
 {
        if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET ||
@@ -4212,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);
 
@@ -4230,13 +4824,53 @@ bool __connman_service_remove(struct connman_service *service)
        g_free(service->eap);
        service->eap = NULL;
 
+#if defined TIZEN_EXT
+       g_free(service->ca_cert_file);
+       service->ca_cert_file = NULL;
+
+       g_free(service->client_cert_file);
+       service->client_cert_file = NULL;
+
+       g_free(service->private_key_file);
+       service->private_key_file = NULL;
+
+       g_free(service->private_key_passphrase);
+       service->private_key_passphrase = NULL;
+
+       g_free(service->phase2);
+       service->phase2 = NULL;
+
+       __connman_service_cleanup_network_8021x(service);
+
+       __connman_ipconfig_set_method(service->ipconfig_ipv4, CONNMAN_IPCONFIG_METHOD_DHCP);
+       __connman_ipconfig_set_method(service->ipconfig_ipv6, CONNMAN_IPCONFIG_METHOD_AUTO);
+       connman_service_set_proxy(service, NULL, false);
+
+       __connman_service_nameserver_clear(service);
+
+       g_strfreev(service->nameservers_config);
+       service->nameservers_config = NULL;
+
+#endif
+
+#if defined TIZEN_EXT
+       if (service->security != CONNMAN_SERVICE_SECURITY_8021X)
+#endif
+       set_idle(service);
+
        service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
 
+       service->user.favorite_user = USER_NONE;
+
        __connman_service_set_favorite(service, false);
 
        __connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6);
 
+#if defined TIZEN_EXT
+       __connman_storage_remove_service(service->identifier);
+#else
        service_save(service);
+#endif
 
        return true;
 }
@@ -4257,10 +4891,12 @@ static DBusMessage *remove_service(DBusConnection *conn,
                        return __connman_error_permission_denied(msg);
                }
 
+#if !defined TIZEN_EXT
                if (!connman_service_is_user_allowed(service, uid)) {
                        DBG("Not allow this user to remove this wifi service now!");
                        return __connman_error_permission_denied(msg);
                }
+#endif
        }
 
        if (!__connman_service_remove(service))
@@ -4472,6 +5108,30 @@ static DBusMessage *reset_counters(DBusConnection *conn,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
+static DBusMessage *get_user_favorite(DBusConnection *conn,
+                                       DBusMessage *msg, void *user_data)
+{
+       DBusMessage *reply;
+       uid_t uid = USER_NONE;
+       dbus_bool_t user_favorite = false;
+       struct connman_service *service = user_data;
+
+       connman_dbus_get_connection_unix_user_sync(conn,
+                                       dbus_message_get_sender(msg),
+                                       &uid);
+       if (uid == USER_ROOT)
+               user_favorite = service->favorite;
+       else if (uid != USER_NONE && uid == service->user.favorite_user) {
+               DBG("The service is favorite to this user!");
+               user_favorite = true;
+       }
+
+       reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+       dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN,
+                               &user_favorite, DBUS_TYPE_INVALID);
+       return reply;
+}
+
 static struct _services_notify {
        int id;
        GHashTable *add;
@@ -4582,6 +5242,10 @@ static void service_schedule_removed(struct connman_service *service)
 
 static bool allow_property_changed(struct connman_service *service)
 {
+#if defined TIZEN_EXT
+       if (service->path == NULL)
+               return FALSE;
+#endif
        if (g_hash_table_lookup_extended(services_notify->add, service->path,
                                        NULL, NULL)) {
                DBG("no property updates for service %p", service);
@@ -4613,6 +5277,9 @@ static const GDBusMethodTable service_methods[] = {
                        GDBUS_ARGS({ "service", "o" }), NULL,
                        move_after) },
        { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
+       { GDBUS_METHOD("GetUserFavorite",
+                       NULL, GDBUS_ARGS({ "value", "v" }),
+                       get_user_favorite) },
        { },
 };
 
@@ -4757,6 +5424,14 @@ static void service_initialize(struct connman_service *service)
        service->provider = NULL;
 
        service->wps = false;
+#if defined TIZEN_EXT
+       service->storage_reload = false;
+       /*
+        * Description: TIZEN implements system global connection management.
+        */
+       service->user_pdn_connection_refcount = 0;
+       __sync_synchronize();
+#endif
 }
 
 /**
@@ -5065,6 +5740,11 @@ bool __connman_service_is_connected_state(struct connman_service *service,
                return is_connected_state(service, service->state_ipv4);
        case CONNMAN_IPCONFIG_TYPE_IPV6:
                return is_connected_state(service, service->state_ipv6);
+       case CONNMAN_IPCONFIG_TYPE_ALL:
+               return is_connected_state(service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV4) &&
+                       is_connected_state(service,
+                                       CONNMAN_IPCONFIG_TYPE_IPV6);
        }
 
        return false;
@@ -5099,6 +5779,53 @@ void __connman_service_mark_dirty(void)
        services_dirty = true;
 }
 
+#if defined TIZEN_EXT
+/**
+  * Returns profile count if there is any connected profiles
+  * that use same interface
+  */
+int __connman_service_get_connected_count_of_iface(
+                                       struct connman_service *service)
+{
+       GList *list;
+       int count = 0;
+       int index1 = 0;
+       int index2 = 0;
+
+       DBG("");
+
+       index1 = __connman_service_get_index(service);
+
+       if (index1 <= 0)
+               return 0;
+
+       for (list = service_list; list; list = list->next) {
+               struct connman_service *service2 = list->data;
+
+               if (service == service2)
+                       continue;
+
+               index2 = __connman_service_get_index(service2);
+
+               if (is_connected(service2) && index2 > 0 && index1 == index2)
+                       count++;
+
+               index2 = 0;
+       }
+
+       DBG("Interface index %d, count %d", index1, count);
+
+       return count;
+}
+
+void __connman_service_set_storage_reload(struct connman_service *service,
+                                       bool storage_reload)
+{
+       if (service != NULL)
+               service->storage_reload = storage_reload;
+}
+#endif
+
 /**
  * __connman_service_set_favorite_delayed:
  * @service: service structure
@@ -5111,6 +5838,10 @@ int __connman_service_set_favorite_delayed(struct connman_service *service,
                                        bool favorite,
                                        bool delay_ordering)
 {
+#if defined TIZEN_EXT
+       if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+               return -EIO;
+#endif
        if (service->hidden)
                return -EOPNOTSUPP;
 
@@ -5218,32 +5949,14 @@ void __connman_service_set_string(struct connman_service *service,
 void __connman_service_set_search_domains(struct connman_service *service,
                                        char **domains)
 {
-       int index;
-
-       index = __connman_service_get_index(service);
-       if (index < 0)
-               return;
+       searchdomain_remove_all(service);
 
-       if (service->domains) {
-               remove_searchdomains(service, index, service->domains);
+       if (service->domains)
                g_strfreev(service->domains);
 
-               service->domains = g_strdupv(domains);
-
-               update_nameservers(service);
-       }
-}
-
-/*
- * This variant is used when domain search list is updated via
- * dhcp and in that case the service is not yet fully connected so
- * we cannot do same things as what the set() variant is doing.
- */
-void __connman_service_update_search_domains(struct connman_service *service,
-                                       char **domains)
-{
-       g_strfreev(service->domains);
        service->domains = g_strdupv(domains);
+
+       searchdomain_add_all(service);
 }
 
 static void service_complete(struct connman_service *service)
@@ -5269,7 +5982,14 @@ static void report_error_cb(void *user_context, bool retry,
                /* It is not relevant to stay on Failure state
                 * when failing is due to wrong user input */
                __connman_service_clear_error(service);
+#if defined TIZEN_EXT
+               /* Reseting the state back in case of failure state */
+               service->state_ipv4 = service->state_ipv6 =
+                               CONNMAN_SERVICE_STATE_IDLE;
 
+               if (service->error != CONNMAN_SERVICE_ERROR_AUTH_FAILED)
+                       set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+#endif
                service_complete(service);
                __connman_connection_update_gateway();
        }
@@ -5450,6 +6170,126 @@ static int service_update_preferred_order(struct connman_service *default_servic
        return -EALREADY;
 }
 
+#if defined TIZEN_EXT
+static gboolean __connman_service_can_drop(struct connman_service *service)
+{
+       if (is_connected(service) == TRUE || is_connecting(service) == TRUE) {
+               if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR)
+                       return TRUE;
+               else if (connman_service_is_no_ref_user_pdn_connection(service) == TRUE)
+                       return TRUE;
+       }
+       return FALSE;
+}
+
+static struct connman_device *default_connecting_device = NULL;
+
+static void __connman_service_disconnect_default(struct connman_service *service)
+{
+       struct connman_device *default_device = NULL;
+
+       if (default_connecting_device == NULL)
+               return;
+
+       default_device = connman_network_get_device(
+                       __connman_service_get_network(service));
+
+       DBG("Disconnecting service %p %s", service, service->path);
+       DBG("Disconnecting device %p %p %s",
+                       default_connecting_device,
+                       default_device,
+                       connman_device_get_string(default_device, "Name"));
+
+       if (default_connecting_device == default_device)
+               default_connecting_device = NULL;
+}
+
+static void __connman_service_connect_default(struct connman_service *current)
+{
+       int err;
+       GList *list;
+       bool default_internet;
+       struct connman_service *service;
+       struct connman_service *default_service = NULL;
+       struct connman_device *default_device = NULL;
+
+       if (current->type == CONNMAN_SERVICE_TYPE_CELLULAR) {
+               switch (current->state) {
+               case CONNMAN_SERVICE_STATE_UNKNOWN:
+               case CONNMAN_SERVICE_STATE_ASSOCIATION:
+               case CONNMAN_SERVICE_STATE_CONFIGURATION:
+                       return;
+               default:
+                       break;
+               }
+
+               if (default_connecting_device &&
+                               __connman_service_is_internet_profile(current) == TRUE) {
+                       if (current->network == NULL)
+                               return;
+
+                       default_device = connman_network_get_device(current->network);
+                       if (default_connecting_device == default_device) {
+                               DBG("Cellular service[%s]  %p %s",
+                                               state2string(current->state), current, current->path);
+                               DBG("Cellular device %p %p %s",
+                                               default_connecting_device, default_device,
+                                               connman_device_get_string(default_device, "Name"));
+
+                               default_connecting_device = NULL;
+                       }
+               }
+
+               return;
+       } else if (is_connected(current) == TRUE || is_connecting(current) == TRUE)
+               return;
+
+       /* Always-on: keep default cellular connection as possible */
+       for (list = service_list; list; list = list->next) {
+               service = list->data;
+
+               if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR ||
+                               __connman_service_is_internet_profile(service) != TRUE ||
+                               service->network == NULL) {
+                       continue;
+               }
+
+               default_internet =
+                               connman_network_get_bool(service->network, "DefaultInternet");
+
+               DBG("service: %p %s %s %s (default: %d)", service, service->name,
+                               __connman_service_type2string(service->type),
+                               state2string(service->state), default_internet);
+
+               if (default_internet) {
+                       default_service = service;
+                       if (is_connected(default_service) == TRUE ||
+                                       is_connecting(default_service) == TRUE)
+                               return;
+
+                       default_device = connman_network_get_device(default_service->network);
+                       if (default_connecting_device == default_device) {
+                               DBG("Device is connecting (%p)", default_connecting_device);
+                               return;
+                       }
+
+                       default_connecting_device = default_device;
+                       default_service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_USER;
+
+                       err = __connman_network_connect(default_service->network);
+                       DBG("Connecting default service %p %s [%d]",
+                                       default_service, default_service->path, err);
+                       DBG("Connecting device %p %s", default_connecting_device,
+                                       connman_device_get_string(default_connecting_device, "Name"));
+                       if (err < 0 && err != -EINPROGRESS) {
+                               default_connecting_device = NULL;
+                       } else
+                               break;
+               }
+       }
+}
+#endif
+
 static void single_connected_tech(struct connman_service *allowed)
 {
        struct connman_service *service;
@@ -5458,15 +6298,24 @@ static void single_connected_tech(struct connman_service *allowed)
 
        DBG("keeping %p %s", allowed, allowed->path);
 
+#if defined TIZEN_EXT
+       if (!allowed || allowed->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+               return;
+#endif
+
        for (iter = service_list; iter; iter = iter->next) {
                service = iter->data;
 
+#if defined TIZEN_EXT
+               if (service != allowed && service->type != allowed->type &&
+                               __connman_service_can_drop(service) == TRUE)
+#else
                if (!is_connected(service))
                        break;
 
                if (service == allowed)
                        continue;
-
+#endif
                services = g_slist_prepend(services, service);
        }
 
@@ -5474,12 +6323,32 @@ static void single_connected_tech(struct connman_service *allowed)
                service = list->data;
 
                DBG("disconnecting %p %s", service, service->path);
+#if defined TIZEN_EXT
+               __connman_service_disconnect_default(service);
+#endif
                __connman_service_disconnect(service);
        }
 
        g_slist_free(services);
 }
 
+#if defined TIZEN_EXT
+static void set_priority_connected_service(void)
+{
+       struct connman_service *service;
+       GList *list;
+
+       for (list = service_list; list; list = list->next) {
+               service = list->data;
+
+               if (is_connected(service) == FALSE)
+                       service->order = 5;
+               else
+                       service->order = 6;
+       }
+}
+#endif
+
 static const char *get_dbus_sender(struct connman_service *service)
 {
        if (!service->pending)
@@ -5523,6 +6392,10 @@ static int service_indicate_state(struct connman_service *service)
        if (old_state == CONNMAN_SERVICE_STATE_ONLINE)
                __connman_notifier_leave_online(service->type);
 
+       if (is_connected_state(service, old_state) &&
+                       !is_connected_state(service, new_state))
+               searchdomain_remove_all(service);
+
        service->state = new_state;
        state_changed(service);
 
@@ -5557,6 +6430,8 @@ static int service_indicate_state(struct connman_service *service)
                break;
 
        case CONNMAN_SERVICE_STATE_READY:
+               set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+
                if (service->new_service &&
                                __connman_stats_service_register(service) == 0) {
                        /*
@@ -5585,6 +6460,7 @@ static int service_indicate_state(struct connman_service *service)
                g_get_current_time(&service->modified);
                service_save(service);
 
+               searchdomain_add_all(service);
                dns_changed(service);
                domain_changed(service);
                proxy_changed(service);
@@ -5616,6 +6492,11 @@ static int service_indicate_state(struct connman_service *service)
                else if (service->type != CONNMAN_SERVICE_TYPE_VPN)
                        vpn_auto_connect();
 
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+                       set_priority_connected_service();
+#endif
+
                break;
 
        case CONNMAN_SERVICE_STATE_ONLINE:
@@ -5623,10 +6504,12 @@ static int service_indicate_state(struct connman_service *service)
                break;
 
        case CONNMAN_SERVICE_STATE_DISCONNECT:
+               set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
 
                reply_pending(service, ECONNABORTED);
 
                def_service = __connman_service_get_default();
+               service->disconnect_reason = connman_network_get_disconnect_reason(service->network);
 
                if (!__connman_notifier_is_connected() &&
                        def_service &&
@@ -5639,9 +6522,21 @@ static int service_indicate_state(struct connman_service *service)
 
                __connman_wpad_stop(service);
 
+#if defined TIZEN_EXT
+               /**
+                 * Skip the functions if there is any connected profiles
+                 * that use same interface
+                 */
+               if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR ||
+                       __connman_service_get_connected_count_of_iface(
+                                                       service) <= 0) {
+#endif
                dns_changed(service);
                domain_changed(service);
                proxy_changed(service);
+#if defined TIZEN_EXT
+               }
+#endif
 
                /*
                 * Previous services which are connected and which states
@@ -5654,7 +6549,11 @@ static int service_indicate_state(struct connman_service *service)
                break;
 
        case CONNMAN_SERVICE_STATE_FAILURE:
-
+#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,
                                        error2string(service->error),
@@ -5667,11 +6566,12 @@ static int service_indicate_state(struct connman_service *service)
                break;
        }
 
-       if (new_state != CONNMAN_SERVICE_STATE_FAILURE)
-               set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
-
        service_list_sort();
 
+#if defined TIZEN_EXT
+       __connman_service_connect_default(service);
+#endif
+
        __connman_connection_update_gateway();
 
        if ((old_state == CONNMAN_SERVICE_STATE_ONLINE &&
@@ -5711,17 +6611,27 @@ int __connman_service_indicate_error(struct connman_service *service,
        if (!service)
                return -EINVAL;
 
+       if (service->state == CONNMAN_SERVICE_STATE_FAILURE)
+               return -EALREADY;
+
        set_error(service, error);
 
-       /*
-        * Supplicant does not always return invalid key error for
-        * WPA-EAP so clear the credentials always.
-        */
-       if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY ||
-                       service->security == CONNMAN_SERVICE_SECURITY_8021X)
-               clear_passphrase(service);
+/* default internet service: fix not cleared if pdp activation*/
+#if defined TIZEN_EXT
+               /*
+                * If connection failed for default service(DefaultInternet),
+                * default_connecting_device should be cleared.
+                */
+               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                               service->error == CONNMAN_SERVICE_ERROR_CONNECT_FAILED)
+                       __connman_service_disconnect_default(service);
 
-       __connman_service_set_agent_identity(service, NULL);
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                               service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY) {
+                       g_free(service->passphrase);
+                       service->passphrase = NULL;
+               }
+#endif
 
        __connman_service_ipconfig_indicate_state(service,
                                                CONNMAN_SERVICE_STATE_FAILURE,
@@ -5825,6 +6735,15 @@ done:
        __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
 }
 
+#if defined TIZEN_EXT
+void connman_check_proxy_setup_and_wispr_start(struct connman_service *service){
+
+       DBG("check the proxy and start wispr");
+       check_proxy_setup(service);
+       return;
+}
+#endif
+
 /*
  * How many networks are connected at the same time. If more than 1,
  * then set the rp_filter setting properly (loose mode routing) so that network
@@ -5925,7 +6844,7 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                                        enum connman_ipconfig_type type)
 {
        struct connman_ipconfig *ipconfig = NULL;
-       enum connman_service_state *old_state;
+       enum connman_service_state old_state;
        enum connman_ipconfig_method method;
 
        if (!service)
@@ -5933,16 +6852,17 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
 
        switch (type) {
        case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+       case CONNMAN_IPCONFIG_TYPE_ALL:
                return -EINVAL;
 
        case CONNMAN_IPCONFIG_TYPE_IPV4:
-               old_state = &service->state_ipv4;
+               old_state = service->state_ipv4;
                ipconfig = service->ipconfig_ipv4;
 
                break;
 
        case CONNMAN_IPCONFIG_TYPE_IPV6:
-               old_state = &service->state_ipv6;
+               old_state = service->state_ipv6;
                ipconfig = service->ipconfig_ipv6;
 
                break;
@@ -5952,12 +6872,24 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                return -EINVAL;
 
        /* Any change? */
-       if (*old_state == new_state)
+       if (old_state == new_state)
                return -EALREADY;
 
+#if defined TIZEN_EXT
+       __sync_synchronize();
+       if (service->user_pdn_connection_refcount > 0 &&
+                       service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+               if (new_state == CONNMAN_SERVICE_STATE_FAILURE ||
+                               new_state == CONNMAN_SERVICE_STATE_DISCONNECT ||
+                               new_state == CONNMAN_SERVICE_STATE_IDLE) {
+                       service->user_pdn_connection_refcount = 0;
+                       __sync_synchronize();
+               }
+#endif
+
        DBG("service %p (%s) old state %d (%s) new state %d (%s) type %d (%s)",
                service, service ? service->identifier : NULL,
-               *old_state, state2string(*old_state),
+               old_state, state2string(old_state),
                new_state, state2string(new_state),
                type, __connman_ipconfig_type2string(type));
 
@@ -5970,8 +6902,19 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                __connman_ipconfig_enable(ipconfig);
                break;
        case CONNMAN_SERVICE_STATE_READY:
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                               __connman_service_is_internet_profile(service) != TRUE) {
+                       if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+                               service_rp_filter(service, TRUE);
+
+                       break;
+               }
+#endif
                if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+#if !defined TIZEN_EXT
                        check_proxy_setup(service);
+#endif
                        service_rp_filter(service, true);
                } else {
                        service->online_check_count = 1;
@@ -6004,17 +6947,39 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                break;
 
        case CONNMAN_IPCONFIG_METHOD_FIXED:
-        case CONNMAN_IPCONFIG_METHOD_MANUAL:
-        case CONNMAN_IPCONFIG_METHOD_DHCP:
-        case CONNMAN_IPCONFIG_METHOD_AUTO:
+       case CONNMAN_IPCONFIG_METHOD_MANUAL:
+       case CONNMAN_IPCONFIG_METHOD_DHCP:
+       case CONNMAN_IPCONFIG_METHOD_AUTO:
                break;
 
        }
 
-       *old_state = new_state;
+       if (is_connected_state(service, old_state) &&
+                       !is_connected_state(service, new_state))
+               nameserver_remove_all(service);
+
+       if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
+               service->state_ipv4 = new_state;
+       else
+               service->state_ipv6 = new_state;
+
+       if (!is_connected_state(service, old_state) &&
+                       is_connected_state(service, new_state))
+               nameserver_add_all(service);
 
-       update_nameservers(service);
+#if defined TIZEN_EXT
+       int ret = service_indicate_state(service);
+       /*Sent the Ready changed signal again in case IPv4 IP set
+         after IPv6 IP set*/
+
+       if(ret == -EALREADY && type == CONNMAN_IPCONFIG_TYPE_IPV4
+                       && new_state == CONNMAN_SERVICE_STATE_READY) {
+               DBG("Notify IPv4 state new/old %d/%d", new_state,old_state);
+               state_changed(service);
+       }
 
+       return ret;
+#endif
        return service_indicate_state(service);
 }
 
@@ -6090,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:
@@ -6111,6 +7103,9 @@ static int service_connect(struct connman_service *service)
                case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
+                       if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
+                               return -ENOKEY;
+
                        if (service->request_passphrase_input) {
                                DBG("Now try to connect other user's favorite service");
                                service->request_passphrase_input = false;
@@ -6152,9 +7147,10 @@ static int service_connect(struct connman_service *service)
                         * missing. Agent provided credentials can be used as
                         * fallback if needed.
                         */
-                       if ((!service->identity &&
+                       if (((!service->identity &&
                                        !service->agent_identity) ||
-                                       !service->passphrase)
+                                       !service->passphrase) ||
+                                       service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
                                return -ENOKEY;
 
                        break;
@@ -6249,16 +7245,14 @@ int __connman_service_connect(struct connman_service *service,
        err = service_connect(service);
 
        service->connect_reason = reason;
-       if (err >= 0) {
-               set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+       if (err >= 0)
                return 0;
-       }
 
        if (err == -EINPROGRESS) {
                if (service->timeout == 0)
                        service->timeout = g_timeout_add_seconds(
                                CONNECT_TIMEOUT, connect_timeout, service);
-               set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+
                return -EINPROGRESS;
        }
 
@@ -6331,6 +7325,14 @@ int __connman_service_disconnect(struct connman_service *service)
                __connman_ipconfig_set_proxy_autoconfig(service->ipconfig_ipv6,
                                                        NULL);
 
+#if defined TIZEN_EXT
+       /**
+         * Skip the functions If there is any connected profiles
+         * that use same interface
+         */
+       if (service->type != CONNMAN_SERVICE_TYPE_CELLULAR ||
+               __connman_service_get_connected_count_of_iface(service) <= 0) {
+#endif
        __connman_ipconfig_address_remove(service->ipconfig_ipv4);
        settings_changed(service, service->ipconfig_ipv4);
 
@@ -6339,6 +7341,9 @@ int __connman_service_disconnect(struct connman_service *service)
 
        __connman_ipconfig_disable(service->ipconfig_ipv4);
        __connman_ipconfig_disable(service->ipconfig_ipv6);
+#if defined TIZEN_EXT
+       }
+#endif
 
        __connman_stats_service_unregister(service);
 
@@ -6805,6 +7810,28 @@ unsigned int __connman_service_get_order(struct connman_service *service)
        if (!service->favorite)
                return 0;
 
+#if defined TIZEN_EXT
+       if (service->type == CONNMAN_SERVICE_TYPE_VPN &&
+                       service->do_split_routing == FALSE)
+               order = 10;
+       else if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
+               if (service->order < 5)
+                       order = 5;
+       } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+               order = 4;
+       else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH)
+               order = 3;
+       else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                       __connman_service_is_internet_profile(service) == TRUE)
+               order = 1;
+       else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR &&
+                       __connman_service_is_tethering_profile(service) == TRUE)
+               order = 0;
+       else if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
+               order = 0;
+       else
+               order = 2;
+#else
        if (service == service_list->data)
                order = 1;
 
@@ -6813,7 +7840,7 @@ unsigned int __connman_service_get_order(struct connman_service *service)
                service->order = 10;
                order = 10;
        }
-
+#endif
        DBG("service %p name %s order %d split %d", service, service->name,
                order, service->do_split_routing);
 
@@ -6866,6 +7893,12 @@ static enum connman_service_security convert_wifi_security(const char *security)
                return CONNMAN_SERVICE_SECURITY_WPA;
        else if (g_str_equal(security, "rsn"))
                return CONNMAN_SERVICE_SECURITY_RSN;
+#if defined TIZEN_EXT
+       else if (g_str_equal(security, "ft_psk") == TRUE)
+               return CONNMAN_SERVICE_SECURITY_PSK;
+       else if (g_str_equal(security, "ft_ieee8021x") == TRUE)
+               return CONNMAN_SERVICE_SECURITY_8021X;
+#endif
        else
                return CONNMAN_SERVICE_SECURITY_UNKNOWN;
 }
@@ -7016,8 +8049,45 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne
 
        if (service->favorite) {
                device = connman_network_get_device(service->network);
-               if (device && !connman_device_get_scanning(device))
-                       __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+               if (device && !connman_device_get_scanning(device)) {
+
+                       switch (service->type) {
+                       case CONNMAN_SERVICE_TYPE_UNKNOWN:
+                       case CONNMAN_SERVICE_TYPE_SYSTEM:
+                       case CONNMAN_SERVICE_TYPE_P2P:
+                               break;
+
+                       case CONNMAN_SERVICE_TYPE_GADGET:
+                       case CONNMAN_SERVICE_TYPE_ETHERNET:
+                               if (service->autoconnect) {
+                                       __connman_service_connect(service,
+                                               CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+                                       break;
+                               }
+
+                               /* fall through */
+                       case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+                       case CONNMAN_SERVICE_TYPE_GPS:
+                       case CONNMAN_SERVICE_TYPE_VPN:
+                       case CONNMAN_SERVICE_TYPE_WIFI:
+                       case CONNMAN_SERVICE_TYPE_CELLULAR:
+                               __connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
+                               break;
+                       }
+               }
+
+#if defined TIZEN_EXT
+               /* TIZEN synchronizes below information when the service creates */
+               if (service->eap != NULL)
+                       connman_network_set_string(service->network, "WiFi.EAP",
+                                                               service->eap);
+               if (service->identity != NULL)
+                       connman_network_set_string(service->network, "WiFi.Identity",
+                                                               service->identity);
+               if (service->phase2 != NULL)
+                       connman_network_set_string(service->network, "WiFi.Phase2",
+                                                               service->phase2);
+#endif
        }
 
        __connman_notifier_service_add(service, service->name);
@@ -7042,6 +8112,13 @@ void __connman_service_update_from_network(struct connman_network *network)
        if (!service->network)
                return;
 
+#if defined TIZEN_EXT
+       if (service->storage_reload) {
+               service_load(service);
+               __connman_service_set_storage_reload(service, false);
+       }
+#endif
+
        name = connman_network_get_string(service->network, "Name");
        if (g_strcmp0(service->name, name) != 0) {
                g_free(service->name);