Maintain connection status when wifi roaming
[platform/upstream/connman.git] / src / service.c
old mode 100644 (file)
new mode 100755 (executable)
index 2f497d1..356a218
 
 #define CONNECT_TIMEOUT                120
 
+#if defined TIZEN_EXT
+#define WIFI_BSSID_STR_LEN     18
+#define MAX_WIFI_PROFILES      200
+
+#define FREQ_RANGE_24GHZ_CHANNEL_1   2412
+#define FREQ_RANGE_24GHZ_CHANNEL_14  2484
+#define FREQ_RANGE_5GHZ_CHANNEL_32   5160
+#define FREQ_RANGE_5GHZ_CHANNEL_165  5825
+
+#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
+#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
+#endif
 #define VPN_AUTOCONNECT_TIMEOUT_DEFAULT 1
 #define VPN_AUTOCONNECT_TIMEOUT_STEP 30
 #define VPN_AUTOCONNECT_TIMEOUT_ATTEMPTS_THRESHOLD 270
@@ -54,6 +66,50 @@ static unsigned int autoconnect_id = 0;
 static unsigned int vpn_autoconnect_id = 0;
 static struct connman_service *current_default = NULL;
 static bool services_dirty = false;
+static bool enable_online_to_ready_transition = false;
+static unsigned int online_check_initial_interval = 0;
+static unsigned int online_check_max_interval = 0;
+
+#if defined TIZEN_EXT
+static bool auto_connect_mode = TRUE;
+
+struct saved_profiles {
+       GTimeVal modified;
+       gchar *profile_name;
+};
+
+static unsigned char invalid_bssid[WIFI_BSSID_LEN_MAX] = {
+       0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+#endif
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+enum connman_ins_preferred_freq {
+       CONNMAN_INS_PREFERRED_FREQ_UNKNOWN,
+       CONNMAN_INS_PREFERRED_FREQ_24GHZ,
+       CONNMAN_INS_PREFERRED_FREQ_5GHZ,
+};
+
+struct connman_ins_settings {
+       bool last_user_selection;
+       unsigned int last_user_selection_time;
+       unsigned int last_user_selection_score;
+       bool last_connected;
+       unsigned int last_connected_score;
+       enum connman_ins_preferred_freq preferred_freq;
+       unsigned int preferred_freq_score;
+       unsigned int security_priority[CONNMAN_SERVICE_SECURITY_MAX];
+       unsigned int security_priority_count;
+       unsigned int security_priority_score;
+       bool signal;
+       bool internet;
+       unsigned int internet_score;
+       int signal_level3_5ghz;
+       int signal_level3_24ghz;
+};
+
+static struct connman_ins_settings ins_settings;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
 struct connman_stats {
        bool valid;
@@ -134,13 +190,71 @@ struct connman_service {
        bool wps;
        bool wps_advertizing;
        guint online_timeout;
-       int online_check_interval_ipv4;
-       int online_check_interval_ipv6;
+       unsigned int online_check_interval_ipv4;
+       unsigned int online_check_interval_ipv6;
        bool do_split_routing;
        bool new_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;
+       int assoc_status_code;
+       /*
+        * Only for EAP-FAST and EAP-PEAP in EAPoL.
+        */
+       char *phase1;
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * Only for EAP-FAST
+        */
+       char *pac_file;
+#endif
+       /*
+        * Description: To indicate that disconnection triggered by user.
+        */
+       bool disconnection_requested;
+
+       enum connman_dnsconfig_method dns_config_method_ipv4;
+       enum connman_dnsconfig_method dns_config_method_ipv6;
+#endif
+#if defined TIZEN_EXT
+       char *connector;
+       char *c_sign_key;
+       char *net_access_key;
+       unsigned char last_connected_bssid[WIFI_BSSID_LEN_MAX];
+       bool is_internet_connection;
+       int assoc_reject_count;
+#if defined TIZEN_EXT_INS
+       int score_last_user_selection;
+       int score_last_connected;
+       int score_frequency;
+       int score_security_priority;
+       int score_internet_connection;
+       int score_strength;
+#endif
+       int ins_score;
+#endif
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       /*
+        * To indicate use of EAP over Ethernet.
+        */
+       bool use_eapol;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 };
 
 static bool allow_property_changed(struct connman_service *service);
@@ -157,6 +271,55 @@ struct find_data {
        struct connman_service *service;
 };
 
+#if defined TIZEN_EXT
+struct assoc_reject_data {
+       char *bssid;
+       GSList *reject_time_list;
+};
+
+/*
+ * 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;
@@ -192,6 +355,8 @@ static const char *reason2string(enum connman_service_connect_reason reason)
                return "auto";
        case CONNMAN_SERVICE_CONNECT_REASON_SESSION:
                return "session";
+       case CONNMAN_SERVICE_CONNECT_REASON_NATIVE:
+               return "native";
        }
 
        return "unknown";
@@ -220,6 +385,10 @@ const char *__connman_service_type2string(enum connman_service_type type)
                return "gadget";
        case CONNMAN_SERVICE_TYPE_P2P:
                return "p2p";
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+               return "mesh";
+#endif
        }
 
        return NULL;
@@ -265,6 +434,16 @@ 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;
+       if (!strcmp(str, "sae"))
+               return CONNMAN_SERVICE_SECURITY_SAE;
+       if (!strcmp(str, "owe"))
+               return CONNMAN_SERVICE_SECURITY_OWE;
+       if (!strcmp(str, "dpp"))
+               return CONNMAN_SERVICE_SECURITY_DPP;
+#endif
 
        return CONNMAN_SERVICE_SECURITY_UNKNOWN;
 }
@@ -280,8 +459,20 @@ 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";
+       case CONNMAN_SERVICE_SECURITY_SAE:
+               return "sae";
+       case CONNMAN_SERVICE_SECURITY_OWE:
+               return "owe";
+       case CONNMAN_SERVICE_SECURITY_DPP:
+               return "dpp";
+#else
        case CONNMAN_SERVICE_SECURITY_RSN:
                return "psk";
+#endif
        case CONNMAN_SERVICE_SECURITY_8021X:
                return "ieee8021x";
        }
@@ -330,6 +521,10 @@ static const char *error2string(enum connman_service_error error)
                return "login-failed";
        case CONNMAN_SERVICE_ERROR_AUTH_FAILED:
                return "auth-failed";
+#ifdef TIZEN_EXT
+       case CONNMAN_SERVICE_ERROR_ASSOC_FAILED:
+               return "assoc-failed";
+#endif
        case CONNMAN_SERVICE_ERROR_INVALID_KEY:
                return "invalid-key";
        case CONNMAN_SERVICE_ERROR_BLOCKED:
@@ -367,7 +562,53 @@ static enum connman_service_proxy_method string2proxymethod(const char *method)
                return CONNMAN_SERVICE_PROXY_METHOD_UNKNOWN;
 }
 
-static void set_split_routing(struct connman_service *service, bool value)
+#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
+
+void __connman_service_split_routing_changed(struct connman_service *service)
+{
+       dbus_bool_t split_routing;
+
+       if (!service->path)
+               return;
+
+       if (!allow_property_changed(service))
+               return;
+
+       split_routing = service->do_split_routing;
+       if (!connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "SplitRouting",
+                                       DBUS_TYPE_BOOLEAN, &split_routing))
+               connman_warn("cannot send SplitRouting property change on %s",
+                                       service->identifier);
+}
+
+void __connman_service_set_split_routing(struct connman_service *service,
+                                                               bool value)
 {
        if (service->type != CONNMAN_SERVICE_TYPE_VPN)
                return;
@@ -378,6 +619,12 @@ static void set_split_routing(struct connman_service *service, bool value)
                service->order = 0;
        else
                service->order = 10;
+
+       /*
+        * In order to make sure the value is propagated also when loading the
+        * VPN service signal the value regardless of the value change.
+        */
+       __connman_service_split_routing_changed(service);
 }
 
 int __connman_service_load_modifiable(struct connman_service *service)
@@ -398,11 +645,15 @@ int __connman_service_load_modifiable(struct connman_service *service)
        case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                break;
        case CONNMAN_SERVICE_TYPE_VPN:
-               set_split_routing(service, g_key_file_get_boolean(keyfile,
-                                                       service->identifier,
-                                                       "SplitRouting", NULL));
+               __connman_service_set_split_routing(service,
+                                               g_key_file_get_boolean(keyfile,
+                                               service->identifier,
+                                               "SplitRouting", NULL));
 
                /* fall through */
        case CONNMAN_SERVICE_TYPE_WIFI:
@@ -430,6 +681,382 @@ int __connman_service_load_modifiable(struct connman_service *service)
        return 0;
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static void __connman_service_cleanup_8021x(struct connman_service *service)
+{
+       if (service == NULL)
+               return;
+
+       DBG("service %p ", service);
+
+       __connman_service_set_string(service, "EAP", NULL);
+       __connman_service_set_string(service, "Identity", NULL);
+       __connman_service_set_string(service, "Passphrase", NULL);
+       __connman_service_set_string(service, "AnonymousIdentity", NULL);
+       __connman_service_set_string(service, "CACertFile", NULL);
+       __connman_service_set_string(service, "ClientCertFile", NULL);
+       __connman_service_set_string(service, "PrivateKeyFile", NULL);
+       __connman_service_set_string(service, "PrivateKeyPassphrase", NULL);
+       __connman_service_set_string(service, "Phase1", NULL);
+       __connman_service_set_string(service, "Phase2", NULL);
+       __connman_service_set_string(service, "PacFile", NULL);
+}
+
+static int connman_service_set_eapol_property(struct connman_service *service,
+                       DBusMessageIter *array)
+{
+       DBusMessageIter dict;
+       char *str = NULL;
+
+       __connman_service_cleanup_8021x(service);
+
+       if (dbus_message_iter_get_arg_type(array) != DBUS_TYPE_ARRAY)
+               return -EINVAL;
+
+       dbus_message_iter_recurse(array, &dict);
+
+       while(dbus_message_iter_get_arg_type(&dict) == DBUS_TYPE_DICT_ENTRY) {
+               DBusMessageIter entry, value;
+               const char *key;
+               int type;
+
+               dbus_message_iter_recurse(&dict, &entry);
+
+               if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_STRING)
+                       return -EINVAL;
+
+               dbus_message_iter_get_basic(&entry, &key);
+               dbus_message_iter_next(&entry);
+
+               if (dbus_message_iter_get_arg_type(&entry) != DBUS_TYPE_VARIANT)
+                       return -EINVAL;
+
+               dbus_message_iter_recurse(&entry, &value);
+
+               type = dbus_message_iter_get_arg_type(&value);
+
+               if (g_str_equal(key, "UseEapol")) {
+                       dbus_bool_t use_eapol;
+
+                       if (type != DBUS_TYPE_BOOLEAN)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &use_eapol);
+                       service->use_eapol = use_eapol;
+
+               } else if (g_str_equal(key, "EAP")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "EAP", str);
+
+               } else if (g_str_equal(key, "Identity")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "Identity", str);
+
+               } else if (g_str_equal(key, "AnonymousIdentity")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "AnonymousIdentity", str);
+
+               } else if (g_str_equal(key, "CACertFile")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "CACertFile", str);
+               } else if (g_str_equal(key, "ClientCertFile")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "ClientCertFile", str);
+               } else if (g_str_equal(key, "PrivateKeyFile")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "PrivateKeyFile", str);
+               } else if (g_str_equal(key, "PrivateKeyPassphrase")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "PrivateKeyPassphrase", str);
+               } else if (g_str_equal(key, "Phase2")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "Phase2", str);
+               } else if (g_str_equal(key, "Phase1")) {
+                       int val;
+                       char phase1[5] = {0,};
+
+                       if (type != DBUS_TYPE_INT32)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &val);
+                       sprintf(phase1, "%d", val);
+                       __connman_service_set_string(service, "Phase1", phase1);
+               } else if (g_str_equal(key, "PacFile")) {
+                       if (type != DBUS_TYPE_STRING)
+                               return -EINVAL;
+
+                       dbus_message_iter_get_basic(&value, &str);
+                       __connman_service_set_string(service, "PacFile", str);
+               }
+
+               dbus_message_iter_next(&dict);
+       }
+
+       return 0;
+}
+#endif
+
+#if defined TIZEN_EXT
+static void save_assoc_reject(gpointer key, gpointer value, gpointer user_data)
+{
+       struct assoc_reject_data *assoc_rd = value;
+       GString *assoc_reject_str = user_data;
+       GSList *list;
+       char *val_str;
+
+       if (g_slist_length(assoc_rd->reject_time_list) < 1)
+               return;
+
+       for (list = assoc_rd->reject_time_list; list; list = list->next) {
+               time_t assoc_reject_time = GPOINTER_TO_INT(list->data);
+
+               val_str = g_strdup_printf("%s_%ld", assoc_rd->bssid, assoc_reject_time);
+
+               if (assoc_reject_str->len > 0)
+                       g_string_append_printf(assoc_reject_str, " %s", val_str);
+               else
+                       g_string_append(assoc_reject_str, val_str);
+
+               g_free(val_str);
+       }
+}
+
+static void count_assoc_reject(gpointer key, gpointer value, gpointer user_data)
+{
+       struct assoc_reject_data *assoc_data = value;
+       int *assoc_reject_count = user_data;
+
+       if (assoc_data)
+               *assoc_reject_count += g_slist_length(assoc_data->reject_time_list);
+}
+
+static bool update_assoc_reject(struct connman_service *service)
+{
+       GHashTable *assoc_reject_table;
+       int assoc_reject_count;
+
+       if (!service->network)
+               return false;
+
+       assoc_reject_table = connman_network_get_assoc_reject_table(service->network);
+       if (assoc_reject_table) {
+               assoc_reject_count = 0;
+               g_hash_table_foreach(assoc_reject_table, count_assoc_reject, &assoc_reject_count);
+#if defined TIZEN_EXT_INS
+               DBG("assoc reject count [%d -> %d]",
+                       service->assoc_reject_count, assoc_reject_count);
+#endif
+               if (service->assoc_reject_count != assoc_reject_count) {
+                       service->assoc_reject_count = assoc_reject_count;
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+static int service_ext_load(struct connman_service *service)
+{
+       GKeyFile *keyfile;
+       GHashTable *reject_table;
+       char **reject_list;
+       gsize reject_len;
+       struct assoc_reject_data *reject_data;
+       char **bssid_time;
+       char *bssid;
+       time_t reject_time;
+       time_t curr_time;
+       time_t ref_time;
+       struct tm* ref_timeinfo;
+       int i;
+       int err = 0;
+
+       if (!simplified_log)
+               DBG("service %p", service);
+
+       if (!service->network)
+               return -EINVAL;
+
+       if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+               return -EINVAL;
+
+       keyfile = connman_storage_load_service(service->identifier);
+       if (!keyfile)
+               return -EIO;
+
+       reject_table = connman_network_get_assoc_reject_table(service->network);
+
+       reject_list = g_key_file_get_string_list(keyfile,
+               service->identifier, "AssocReject", &reject_len, NULL);
+
+       if (!reject_list || reject_len == 0) {
+               g_strfreev(reject_list);
+               goto done;
+       }
+
+       /* Only events that occur within one hour are appened. */
+       curr_time = time(NULL);
+       ref_timeinfo = localtime(&curr_time);
+       ref_timeinfo->tm_hour -= 1;
+       ref_time = mktime(ref_timeinfo);
+
+       for (i = 0; reject_list[i]; i++) {
+               bssid_time = g_strsplit(reject_list[i], "_", 0);
+               if (!bssid_time) {
+                       err = -ERANGE;
+                       continue;
+               }
+
+               bssid = bssid_time[0];
+               reject_time = strtol(bssid_time[1], NULL, 10);
+
+               if (reject_time < ref_time) {
+                       g_strfreev(bssid_time);
+                       err = -ERANGE;
+                       continue;
+               }
+
+               reject_data = g_hash_table_lookup(reject_table, bssid);
+               if (!reject_data) {
+                       reject_data = g_try_new0(struct assoc_reject_data, 1);
+                       if (!reject_data) {
+                               g_strfreev(bssid_time);
+                               err = -ERANGE;
+                               continue;
+                       }
+
+                       reject_data->bssid = g_strdup(bssid);
+                       g_hash_table_insert(reject_table, reject_data->bssid, reject_data);
+               }
+
+               reject_data->reject_time_list = g_slist_append(reject_data->reject_time_list,
+                               GINT_TO_POINTER(reject_time));
+
+#if defined TIZEN_EXT_INS
+               DBG("assoc reject [%s_%ld]", bssid, reject_time);
+#endif
+
+               g_strfreev(bssid_time);
+       }
+
+       g_strfreev(reject_list);
+
+done:
+       g_key_file_free(keyfile);
+       return err;
+}
+
+static int service_ext_save(struct connman_service *service)
+{
+       GKeyFile *keyfile;
+       GHashTable *reject_table;
+       GString *reject_str;
+       char **reject_list;
+       guint reject_len;
+       int err = 0;
+
+       DBG("service %p", service);
+
+       if (!service->network)
+               return -EINVAL;
+
+       if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+               return -EINVAL;
+
+       keyfile = g_key_file_new();
+       if (!keyfile)
+               return -EIO;
+
+       /* Last connected BSSID */
+       if (memcmp(service->last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX)) {
+               char *identifier = service->identifier;
+               GString *bssid_str;
+               unsigned int i;
+
+               bssid_str = g_string_sized_new(MAC_ADDRESS_LENGTH);
+               if (!bssid_str) {
+                       err = -ENOMEM;
+                       goto next;
+               }
+
+               for (i = 0; i < WIFI_BSSID_LEN_MAX; i++) {
+                       g_string_append_printf(bssid_str,
+                                       "%02x", service->last_connected_bssid[i]);
+                       if (i < WIFI_BSSID_LEN_MAX - 1)
+                               g_string_append(bssid_str, ":");
+               }
+
+               g_key_file_set_string(keyfile, identifier,
+                                       "LastConnectedBSSID", bssid_str->str);
+
+#if defined TIZEN_EXT_INS
+               DBG("last connected bssid[%s]", bssid_str->str);
+#endif
+
+               g_string_free(bssid_str, TRUE);
+       }
+
+next:
+
+       /* Assoc reject */
+       reject_table = connman_network_get_assoc_reject_table(service->network);
+       if (reject_table && g_hash_table_size(reject_table) > 0) {
+               reject_str = g_string_new(NULL);
+               if (!reject_str) {
+                       err = -ENOMEM;
+                       goto done;
+               }
+
+               g_hash_table_foreach(reject_table, save_assoc_reject, reject_str);
+
+               reject_list = g_strsplit_set(reject_str->str, " ", 0);
+               reject_len = g_strv_length(reject_list);
+
+               g_key_file_set_string_list(keyfile, service->identifier,
+                       "AssocReject", (const gchar **)reject_list, reject_len);
+
+#if defined TIZEN_EXT_INS
+               DBG("assoc reject table [%d]", reject_len);
+#endif
+
+               g_strfreev(reject_list);
+               g_string_free(reject_str, TRUE);
+       } else {
+               g_key_file_remove_key(keyfile, service->identifier, "AssocReject", NULL);
+       }
+
+done:
+       __connman_storage_save_service(keyfile, service->identifier);
+
+       g_key_file_free(keyfile);
+       return err;
+}
+#endif
+
 static int service_load(struct connman_service *service)
 {
        GKeyFile *keyfile;
@@ -439,7 +1066,15 @@ static int service_load(struct connman_service *service)
        bool autoconnect;
        unsigned int ssid_len;
        int err = 0;
-
+#if defined TIZEN_EXT
+       bool internet_connection;
+#endif
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       bool use_eapol;
+#endif
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("service %p", service);
 
        keyfile = connman_storage_load_service(service->identifier);
@@ -454,11 +1089,15 @@ static int service_load(struct connman_service *service)
        case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                break;
        case CONNMAN_SERVICE_TYPE_VPN:
-               set_split_routing(service, g_key_file_get_boolean(keyfile,
-                                                       service->identifier,
-                                                       "SplitRouting", NULL));
+               __connman_service_set_split_routing(service,
+                                               g_key_file_get_boolean(keyfile,
+                                               service->identifier,
+                                               "SplitRouting", NULL));
 
                autoconnect = g_key_file_get_boolean(keyfile,
                                service->identifier, "AutoConnect", &error);
@@ -516,6 +1155,46 @@ static int service_load(struct connman_service *service)
 
                        g_free(hex_ssid);
                }
+
+#if defined TIZEN_EXT
+               /* Last connected BSSID */
+               if (service->network) {
+                       gchar *bssid_str;
+                       unsigned char last_connected_bssid[WIFI_BSSID_LEN_MAX];
+                       char **str_list;
+                       unsigned int i;
+
+                       bssid_str = g_key_file_get_string(keyfile,
+                               service->identifier, "LastConnectedBSSID", NULL);
+
+                       if (bssid_str) {
+                               str_list = g_strsplit(bssid_str, ":", 0);
+
+                               if (str_list) {
+                                       for (i = 0; i < WIFI_BSSID_LEN_MAX; i++)
+                                               last_connected_bssid[i] = strtol(str_list[i], NULL, 16);
+
+                                       memcpy(service->last_connected_bssid,
+                                               last_connected_bssid, WIFI_BSSID_LEN_MAX);
+
+                                       connman_network_set_last_connected_bssid(service->network,
+                                               last_connected_bssid);
+
+                                       g_strfreev(str_list);
+                               }
+
+                               g_free(bssid_str);
+                       }
+               }
+
+               /* Internet connection */
+               internet_connection = g_key_file_get_boolean(keyfile,
+                               service->identifier, "InternetConnection", &error);
+               if (!error)
+                       service->is_internet_connection = internet_connection;
+
+               g_clear_error(&error);
+#endif
                /* fall through */
 
        case CONNMAN_SERVICE_TYPE_GADGET:
@@ -532,6 +1211,14 @@ static int service_load(struct connman_service *service)
                if (!error)
                        service->autoconnect = autoconnect;
                g_clear_error(&error);
+
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+               use_eapol = g_key_file_get_boolean(keyfile,
+                               service->identifier, "UseEapol", &error);
+               if (!error)
+                       service->use_eapol = use_eapol;
+               g_clear_error(&error);
+#endif
                break;
        }
 
@@ -545,8 +1232,10 @@ static int service_load(struct connman_service *service)
        str = g_key_file_get_string(keyfile,
                                service->identifier, "Passphrase", NULL);
        if (str) {
+               char *dec = g_strcompress(str);
+               g_free(str);
                g_free(service->passphrase);
-               service->passphrase = str;
+               service->passphrase = dec;
        }
 
        if (service->ipconfig_ipv4)
@@ -564,6 +1253,24 @@ static int service_load(struct connman_service *service)
                service->nameservers_config = NULL;
        }
 
+#ifdef TIZEN_EXT
+       char *dns_method;
+
+       dns_method = g_key_file_get_string(keyfile, service->identifier,
+                       "Nameservers.IPv4method", NULL);
+       if (dns_method) {
+               service->dns_config_method_ipv4 = __connman_dnsconfig_string2method(dns_method);
+               g_free(dns_method);
+       }
+
+       dns_method = g_key_file_get_string(keyfile, service->identifier,
+                       "Nameservers.IPv6method", NULL);
+       if (dns_method) {
+               service->dns_config_method_ipv6 = __connman_dnsconfig_string2method(dns_method);
+               g_free(dns_method);
+       }
+#endif
+
        service->timeservers_config = g_key_file_get_string_list(keyfile,
                        service->identifier, "Timeservers", &length, NULL);
        if (service->timeservers_config && length == 0) {
@@ -612,6 +1319,111 @@ static int service_load(struct connman_service *service)
        service->hidden_service = g_key_file_get_boolean(keyfile,
                                        service->identifier, "Hidden", NULL);
 
+#if defined TIZEN_EXT
+       if ((service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service->security == CONNMAN_SERVICE_SECURITY_8021X)
+#if defined TIZEN_EXT_EAP_ON_ETHERNET
+       || (service->type == CONNMAN_SERVICE_TYPE_ETHERNET && service->use_eapol)
+#endif
+       ) {
+               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;
+               }
+
+#if defined TIZEN_EXT_EAP_ON_ETHERNET
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "AnonymousIdentity", NULL);
+               if (str != NULL) {
+                       g_free(service->anonymous_identity);
+                       service->anonymous_identity = str;
+               }
+#endif
+               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;
+               }
+
+#if defined TIZEN_EXT_EAP_ON_ETHERNET
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "Phase1", NULL);
+               if (str != NULL) {
+                       g_free(service->phase1);
+                       service->phase1 = str;
+               }
+
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "PacFile", NULL);
+               if (str != NULL) {
+                       g_free(service->pac_file);
+                       service->pac_file = str;
+               }
+#endif
+       }
+#endif
+#if defined TIZEN_EXT
+       if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service->security == CONNMAN_SERVICE_SECURITY_DPP) {
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "Connector", NULL);
+               if (str != NULL) {
+                       g_free(service->connector);
+                       service->connector = str;
+               }
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "CSignKey", NULL);
+               if (str != NULL) {
+                       g_free(service->c_sign_key);
+                       service->c_sign_key = str;
+               }
+               str = g_key_file_get_string(keyfile,
+                               service->identifier, "NetAccessKey", NULL);
+               if (str != NULL) {
+                       g_free(service->net_access_key);
+                       service->net_access_key = str;
+               }
+       }
+#endif
+
 done:
        g_key_file_free(keyfile);
 
@@ -644,6 +1456,9 @@ static int service_save(struct connman_service *service)
        case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                break;
        case CONNMAN_SERVICE_TYPE_VPN:
                g_key_file_set_boolean(keyfile, service->identifier,
@@ -656,6 +1471,9 @@ static int service_save(struct connman_service *service)
                if (service->network) {
                        const unsigned char *ssid;
                        unsigned int ssid_len = 0;
+#if defined TIZEN_EXT
+                       GHashTable *assoc_reject_table;
+#endif
 
                        ssid = connman_network_get_blob(service->network,
                                                        "WiFi.SSID", &ssid_len);
@@ -684,6 +1502,74 @@ static int service_save(struct connman_service *service)
                        freq = connman_network_get_frequency(service->network);
                        g_key_file_set_integer(keyfile, service->identifier,
                                                "Frequency", freq);
+
+#if defined TIZEN_EXT
+                       /* Last connected BSSID */
+                       if (memcmp(service->last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX)) {
+                               char *identifier = service->identifier;
+                               GString *bssid_str;
+                               unsigned int i;
+
+                               bssid_str = g_string_sized_new(18);
+                               if (!bssid_str) {
+                                       err = -ENOMEM;
+                                       goto done;
+                               }
+
+                               for (i = 0; i < WIFI_BSSID_LEN_MAX; i++) {
+                                       g_string_append_printf(bssid_str,
+                                                       "%02x", service->last_connected_bssid[i]);
+                                       if (i < WIFI_BSSID_LEN_MAX - 1)
+                                               g_string_append(bssid_str, ":");
+                               }
+
+                               g_key_file_set_string(keyfile, identifier,
+                                                       "LastConnectedBSSID", bssid_str->str);
+
+#if defined TIZEN_EXT_INS
+                               DBG("last connected bssid[%s]", bssid_str->str);
+#endif
+
+                               g_string_free(bssid_str, TRUE);
+                       }
+
+                       /* Assoc reject */
+                       assoc_reject_table = connman_network_get_assoc_reject_table(service->network);
+                       if (assoc_reject_table && g_hash_table_size(assoc_reject_table) > 0) {
+                               GString *assoc_reject_str;
+                               char **assoc_reject_list;
+                               guint assoc_reject_len;
+
+                               assoc_reject_str = g_string_new(NULL);
+                               if (!assoc_reject_str) {
+                                       err = -ENOMEM;
+                                       goto done;
+                               }
+
+                               g_hash_table_foreach(assoc_reject_table, save_assoc_reject, assoc_reject_str);
+
+                               assoc_reject_list = g_strsplit_set(assoc_reject_str->str, " ", 0);
+                               assoc_reject_len = g_strv_length(assoc_reject_list);
+
+                               g_key_file_set_string_list(keyfile, service->identifier,
+                                       "AssocReject", (const gchar **)assoc_reject_list, assoc_reject_len);
+
+#if defined TIZEN_EXT_INS
+                               DBG("assoc reject table [%d]", assoc_reject_len);
+#endif
+
+                               g_strfreev(assoc_reject_list);
+                               g_string_free(assoc_reject_str, TRUE);
+                       } else
+                               g_key_file_remove_key(keyfile, service->identifier, "AssocReject", NULL);
+
+                       /* Internet connection */
+                       g_key_file_set_boolean(keyfile, service->identifier,
+                                       "InternetConnection", service->is_internet_connection);
+#if defined TIZEN_EXT_INS
+                       DBG("internet connection [%s]", service->is_internet_connection ? "true" : "false");
+#endif
+#endif
                }
                /* fall through */
 
@@ -699,6 +1585,10 @@ static int service_save(struct connman_service *service)
                if (service->favorite)
                        g_key_file_set_boolean(keyfile, service->identifier,
                                        "AutoConnect", service->autoconnect);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+               g_key_file_set_boolean(keyfile, service->identifier,
+                               "UseEapol", service->use_eapol);
+#endif
                break;
        }
 
@@ -709,9 +1599,12 @@ static int service_save(struct connman_service *service)
                g_free(str);
        }
 
-       if (service->passphrase && strlen(service->passphrase) > 0)
+       if (service->passphrase && strlen(service->passphrase) > 0) {
+               char *enc = g_strescape(service->passphrase, NULL);
                g_key_file_set_string(keyfile, service->identifier,
-                               "Passphrase", service->passphrase);
+                               "Passphrase", enc);
+               g_free(enc);
+       }
 
        if (service->ipconfig_ipv4)
                __connman_ipconfig_save(service->ipconfig_ipv4, keyfile,
@@ -729,6 +1622,28 @@ static int service_save(struct connman_service *service)
                                (const gchar **) service->nameservers_config, len);
        }
 
+#if defined TIZEN_EXT
+       if(service->dns_config_method_ipv4 != 0) {
+               const char *method;
+               method = __connman_dnsconfig_method2string(
+                               service->dns_config_method_ipv4);
+               g_key_file_set_string(keyfile, service->identifier,
+                               "Nameservers.IPv4method", method);
+       } else
+       g_key_file_remove_key(keyfile, service->identifier,
+                                               "Nameservers.IPv4method", NULL);
+
+       if(service->dns_config_method_ipv6 != 0) {
+               const char *method;
+               method = __connman_dnsconfig_method2string(
+                               service->dns_config_method_ipv6);
+               g_key_file_set_string(keyfile, service->identifier,
+                               "Nameservers.IPv6method", method);
+       } else
+       g_key_file_remove_key(keyfile, service->identifier,
+                                                       "Nameservers.IPv6method", NULL);
+#endif
+
        if (service->timeservers_config) {
                guint len = g_strv_length(service->timeservers_config);
 
@@ -758,41 +1673,235 @@ static int service_save(struct connman_service *service)
                                (const gchar **) service->proxies, len);
        }
 
-       if (service->excludes) {
-               guint len = g_strv_length(service->excludes);
+       if (service->excludes) {
+               guint len = g_strv_length(service->excludes);
+
+               g_key_file_set_string_list(keyfile, service->identifier,
+                               "Proxy.Excludes",
+                               (const gchar **) service->excludes, len);
+       }
+
+       if (service->pac && strlen(service->pac) > 0)
+               g_key_file_set_string(keyfile, service->identifier,
+                               "Proxy.URL", service->pac);
+
+       if (service->mdns_config)
+               g_key_file_set_boolean(keyfile, service->identifier,
+                               "mDNS", TRUE);
+
+       if (service->hidden_service)
+               g_key_file_set_boolean(keyfile, service->identifier,
+                               "Hidden", TRUE);
+
+       if (service->config_file && strlen(service->config_file) > 0)
+               g_key_file_set_string(keyfile, service->identifier,
+                               "Config.file", service->config_file);
+
+       if (service->config_entry && strlen(service->config_entry) > 0)
+               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 defined TIZEN_EXT_EAP_ON_ETHERNET
+       || (service->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+#endif
+       ) {
+               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 defined TIZEN_EXT_EAP_ON_ETHERNET
+               if (service->anonymous_identity != NULL && strlen(service->anonymous_identity) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "AnonymousIdentity", service->anonymous_identity);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "AnonymousIdentity", NULL);
+#endif
+
+               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);
+#if defined TIZEN_EXT_EAP_ON_ETHERNET
+               if (service->phase1 != NULL && strlen(service->phase1) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "Phase1", service->phase1);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "Phase1", NULL);
+               if (service->pac_file != NULL && strlen(service->pac_file) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "PacFile", service->pac_file);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "PacFile", NULL);
+#endif
+       }
+
+       if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service->security == CONNMAN_SERVICE_SECURITY_DPP) {
+               if (service->connector != NULL && strlen(service->connector) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "Connector", service->connector);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "Connector", NULL);
+
+               if (service->c_sign_key != NULL && strlen(service->c_sign_key) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "CSignKey", service->c_sign_key);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "CSignKey", NULL);
+
+               if (service->net_access_key != NULL && strlen(service->net_access_key) > 0)
+                       g_key_file_set_string(keyfile, service->identifier,
+                                       "NetAccessKey", service->net_access_key);
+               else
+                       g_key_file_remove_key(keyfile, service->identifier,
+                                       "NetAccessKey", NULL);
+       }
+#endif
+
+done:
+       __connman_storage_save_service(keyfile, service->identifier);
+
+       g_key_file_free(keyfile);
+
+       return err;
+}
+
+#if defined TIZEN_EXT
+static gint sort_entry(gconstpointer a, gconstpointer b, gpointer user_data)
+{
+       GTimeVal *aval = (GTimeVal *)a;
+       GTimeVal *bval = (GTimeVal *)b;
+
+       /* Note that the sort order is ascending */
+       if (aval->tv_sec > bval->tv_sec)
+               return 1;
+
+       if (aval->tv_sec < bval->tv_sec)
+               return -1;
+
+       return 0;
+}
+
+static void free_entry(gpointer data)
+{
+       struct saved_profiles *entry = data;
+       g_free(entry->profile_name);
+       g_free(entry);
+}
+
+static void __connman_manage_saved_profiles()
+{
+       GKeyFile *keyfile;
+       gchar **services = NULL;
+       GTimeVal modified;
+       int i, num_profiles = 0;
+       GSequenceIter *iter;
+       GSequence *profile_list;
+       struct saved_profiles *entry;
+
+       profile_list = g_sequence_new(free_entry);
+       if (!profile_list)
+               return;
+
+       services = connman_storage_get_services();
+
+       /* Check the count of saved profiles */
+       for (i = 0; services && services[i]; i++) {
+               if (strncmp(services[i], "wifi_", 5) != 0)
+                       continue;
+
+               keyfile = connman_storage_load_service(services[i]);
+               if (!keyfile)
+                       continue;
+
+               gchar *str = g_key_file_get_string(keyfile,
+                               services[i], "Modified", NULL);
+               if (!str) {
+                       g_key_file_free(keyfile);
+                       continue;
+               }
 
-               g_key_file_set_string_list(keyfile, service->identifier,
-                               "Proxy.Excludes",
-                               (const gchar **) service->excludes, len);
-       }
+               g_time_val_from_iso8601(str, &modified);
+               g_free(str);
 
-       if (service->pac && strlen(service->pac) > 0)
-               g_key_file_set_string(keyfile, service->identifier,
-                               "Proxy.URL", service->pac);
+               entry = g_try_new(struct saved_profiles, 1);
+               if (!entry) {
+                       g_sequence_free(profile_list);
+                       g_key_file_free(keyfile);
+                       g_strfreev(services);
+                       return;
+               }
 
-       if (service->mdns_config)
-               g_key_file_set_boolean(keyfile, service->identifier,
-                               "mDNS", TRUE);
+               entry->modified = modified;
+               entry->profile_name = g_strdup(services[i]);
 
-       if (service->hidden_service)
-               g_key_file_set_boolean(keyfile, service->identifier,
-                               "Hidden", TRUE);
+               g_sequence_insert_sorted(profile_list, entry,
+                               sort_entry, NULL);
 
-       if (service->config_file && strlen(service->config_file) > 0)
-               g_key_file_set_string(keyfile, service->identifier,
-                               "Config.file", service->config_file);
+               num_profiles++;
+       }
+       DBG("number of profiles: %d", num_profiles);
 
-       if (service->config_entry && strlen(service->config_entry) > 0)
-               g_key_file_set_string(keyfile, service->identifier,
-                               "Config.ident", service->config_entry);
+       if (num_profiles > MAX_WIFI_PROFILES) {
+               iter = g_sequence_get_begin_iter(profile_list);
 
-done:
-       __connman_storage_save_service(keyfile, service->identifier);
+               entry = g_sequence_get(iter);
 
-       g_key_file_free(keyfile);
+               if (__connman_storage_remove_service(entry->profile_name) == false)
+                       DBG("Failed to remove service profile: %s", entry->profile_name);
+       }
 
-       return err;
+       g_sequence_free(profile_list);
+       g_strfreev(services);
 }
+#endif
 
 void __connman_service_save(struct connman_service *service)
 {
@@ -800,6 +1909,14 @@ void __connman_service_save(struct connman_service *service)
                return;
 
        service_save(service);
+#if defined TIZEN_EXT
+       /*
+        * Description: Manage the wireless profiles saved in connman.
+        * If the number of saved profiles is more than 200, remove the
+        * profile that is not updated for longer duration.
+        */
+       __connman_manage_saved_profiles();
+#endif
 }
 
 static enum connman_service_state combine_state(
@@ -1052,6 +2169,9 @@ static int nameserver_add(struct connman_service *service,
        if (index < 0)
                return -ENXIO;
 
+#if defined TIZEN_EXT
+       DBG("Resolver append nameserver: %s", nameserver);
+#endif
        ret = connman_resolver_append(index, NULL, nameserver);
        if (ret >= 0)
                nameservers_changed(service);
@@ -1066,14 +2186,115 @@ static int nameserver_add_all(struct connman_service *service,
 
        if (service->nameservers_config) {
                while (service->nameservers_config[i]) {
+#if defined TIZEN_EXT
+                       DBG("type %d add service->nameservers_config[%d]:%s",type,
+                           i, service->nameservers_config[i]);
+                       if(strncmp(service->nameservers_config[i], "::", 2) == 0) {
+                               DBG("Invalid nameserver");
+                               i++;
+                               continue;
+                       }
+
+                       switch(type) {
+                       case CONNMAN_IPCONFIG_TYPE_IPV4:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers_config[i]) == AF_INET &&
+                                   service->dns_config_method_ipv4 ==
+                                   CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers_config[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_IPV6:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers_config[i]) == AF_INET6 &&
+                                   service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers_config[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_ALL:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers_config[i]) == AF_INET &&
+                                   service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers_config[i]);
+                               }
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers_config[i]) == AF_INET6 &&
+                                   service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers_config[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+                               DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing");
+                               break;
+                       default:
+                               DBG("default case do nothing");
+                               break;
+                       }
+#else
                        nameserver_add(service, type,
                                service->nameservers_config[i]);
+#endif
                        i++;
                }
        } else if (service->nameservers) {
                while (service->nameservers[i]) {
+#if defined TIZEN_EXT
+                       DBG("type %d service->nameservers[%d]: %s",type,
+                           i, service->nameservers[i]);
+
+                       switch(type) {
+                       case CONNMAN_IPCONFIG_TYPE_IPV4:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_IPV6:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_ALL:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers[i]);
+                               }
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       nameserver_add(service, type,
+                                                      service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+                               DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing");
+                               break;
+                       default:
+                               DBG("default case do nothing");
+                               break;
+                       }
+#else
                        nameserver_add(service, type,
                                service->nameservers[i]);
+#endif
                        i++;
                }
        }
@@ -1081,6 +2302,12 @@ static int nameserver_add_all(struct connman_service *service,
        if (!i)
                __connman_resolver_append_fallback_nameservers();
 
+#if defined TIZEN_EXT
+       const char *global_dns = connman_setting_get_string("GlobalNameserver");
+       if (global_dns)
+               nameserver_add(service, type, global_dns);
+#endif
+
        searchdomain_add_all(service);
 
        return 0;
@@ -1099,6 +2326,9 @@ static int nameserver_remove(struct connman_service *service,
        if (index < 0)
                return -ENXIO;
 
+#if defined TIZEN_EXT
+       DBG("Resolver remove nameserver: %s", nameserver);
+#endif
        ret = connman_resolver_remove(index, NULL, nameserver);
        if (ret >= 0)
                nameservers_changed(service);
@@ -1109,6 +2339,15 @@ static int nameserver_remove(struct connman_service *service,
 static int nameserver_remove_all(struct connman_service *service,
                                enum connman_ipconfig_type type)
 {
+#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);
@@ -1117,17 +2356,132 @@ static int nameserver_remove_all(struct connman_service *service,
 
        while (service->nameservers_config && service->nameservers_config[i]) {
 
+#if defined TIZEN_EXT
+               DBG("type %d Remove service->nameservers_config[%d]: %s",
+                     type, i, service->nameservers_config[i]);
+               switch(type) {
+               case CONNMAN_IPCONFIG_TYPE_IPV4:
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET &&
+                               (service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP ||
+                               service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL)) {
+                               nameserver_remove(service, type,
+                                                 service->nameservers_config[i]);
+                       }
+                       break;
+               case CONNMAN_IPCONFIG_TYPE_IPV6:
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET6 &&
+                               (service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP ||
+                               service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL)) {
+                               nameserver_remove(service, type,
+                                                 service->nameservers_config[i]);
+                       }
+                       break;
+               case CONNMAN_IPCONFIG_TYPE_ALL:
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET &&
+                               (service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP ||
+                               service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL)) {
+                               nameserver_remove(service, type,
+                                                 service->nameservers_config[i]);
+                       }
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET6 &&
+                               (service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP ||
+                               service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL)) {
+                               nameserver_remove(service, type,
+                                                 service->nameservers_config[i]);
+                       }
+                       break;
+               case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+                       DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing");
+                       break;
+               default:
+                       DBG("default case do nothing");
+                       break;
+               }
+#else
                nameserver_remove(service, type,
                                service->nameservers_config[i]);
+#endif
                i++;
        }
 
        i = 0;
        while (service->nameservers && service->nameservers[i]) {
+#if defined TIZEN_EXT
+               DBG("type %d Remove service->nameservers[%d]: %s",type, i,
+                     service->nameservers[i]);
+               switch(type) {
+                       case CONNMAN_IPCONFIG_TYPE_IPV4:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       (service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_MANUAL ||
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP)) {
+                                       nameserver_remove(service, type,
+                                                         service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_IPV6:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       (service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_MANUAL ||
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP)) {
+                                       nameserver_remove(service, type,
+                                                         service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_ALL:
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       (service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_MANUAL ||
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP)) {
+                                       nameserver_remove(service, type,
+                                                         service->nameservers[i]);
+                               }
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       (service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_MANUAL ||
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP)) {
+                                       nameserver_remove(service, type,
+                                                         service->nameservers[i]);
+                               }
+                               break;
+                       case CONNMAN_IPCONFIG_TYPE_UNKNOWN:
+                               DBG("CONNMAN_IPCONFIG_TYPE_UNKNOWN do nothing");
+                               break;
+                       default:
+                               DBG("default case do nothing");
+                               break;
+               }
+#else
                nameserver_remove(service, type, service->nameservers[i]);
+#endif
                i++;
        }
 
+#if defined TIZEN_EXT
+       const char *global_dns = connman_setting_get_string("GlobalNameserver");
+       if (global_dns)
+               nameserver_remove(service, type, global_dns);
+#endif
        searchdomain_remove_all(service);
 
        return 0;
@@ -1138,8 +2492,14 @@ static int nameserver_remove_all(struct connman_service *service,
  * inserted to resolver via netlink message (see rtnl.c:rtnl_newnduseropt()
  * for details) and not through service.c
  */
+#if defined TIZEN_EXT
+int __connman_service_nameserver_append(struct connman_service *service,
+                               const char *nameserver, bool is_auto,
+                               enum connman_ipconfig_type type)
+#else
 int __connman_service_nameserver_append(struct connman_service *service,
                                const char *nameserver, bool is_auto)
+#endif
 {
        char **nameservers;
        int len, i;
@@ -1156,6 +2516,9 @@ int __connman_service_nameserver_append(struct connman_service *service,
 
        if (nameservers) {
                for (i = 0; nameservers[i]; i++) {
+#if defined TIZEN_EXT
+                       DBG("nameservers[%d] %s, nameserver %s", i, nameservers[i], nameserver);
+#endif
                        if (g_strcmp0(nameservers[i], nameserver) == 0)
                                return -EEXIST;
                }
@@ -1173,6 +2536,16 @@ int __connman_service_nameserver_append(struct connman_service *service,
        nameservers[len] = g_strdup(nameserver);
        nameservers[len + 1] = NULL;
 
+#ifdef TIZEN_EXT
+       if(type == CONNMAN_IPCONFIG_TYPE_IPV4 &&
+          service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN)
+               service->dns_config_method_ipv4 = CONNMAN_DNSCONFIG_METHOD_DHCP;
+
+       if(type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
+          service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_UNKNOWN)
+               service->dns_config_method_ipv6 = CONNMAN_DNSCONFIG_METHOD_DHCP;
+#endif
+
        if (is_auto) {
                service->nameservers_auto = nameservers;
        } else {
@@ -1187,8 +2560,14 @@ int __connman_service_nameserver_append(struct connman_service *service,
        return 0;
 }
 
+#if defined TIZEN_EXT
+int __connman_service_nameserver_remove(struct connman_service *service,
+                               const char *nameserver, bool is_auto,
+                               enum connman_ipconfig_type type)
+#else
 int __connman_service_nameserver_remove(struct connman_service *service,
                                const char *nameserver, bool is_auto)
+#endif
 {
        char **servers, **nameservers;
        bool found = false;
@@ -1246,8 +2625,14 @@ set_servers:
                service->nameservers_auto = nameservers;
        } else {
                service->nameservers = nameservers;
+#if defined TIZEN_EXT
+               DBG("nameserver remove ip_type: %d", type);
+               nameserver_remove(service, type,
+                               nameserver);
+#else
                nameserver_remove(service, CONNMAN_IPCONFIG_TYPE_ALL,
                                nameserver);
+#endif
        }
 
        return 0;
@@ -1416,6 +2801,12 @@ static void start_online_check(struct connman_service *service,
                        "Default service remains in READY state.");
                return;
        }
+       enable_online_to_ready_transition =
+               connman_setting_get_bool("EnableOnlineToReadyTransition");
+       online_check_initial_interval =
+               connman_setting_get_uint("OnlineCheckInitialInterval");
+       online_check_max_interval =
+               connman_setting_get_uint("OnlineCheckMaxInterval");
 
        if (type != CONNMAN_IPCONFIG_TYPE_IPV4 || check_proxy_setup(service)) {
                cancel_online_check(service);
@@ -1524,8 +2915,93 @@ 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;
+}
+
+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 defined TIZEN_MAINTAIN_ONLINE
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                               service->state == CONNMAN_SERVICE_STATE_ONLINE) {
+#else
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                               is_connected(service->state) == TRUE) {
+#endif
+                       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->state) == TRUE &&
+                                       is_connected(default_service->state) == FALSE)
+                               default_service = service;
+               } else if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET &&
+                               is_connected(service->state) == TRUE) {
+                       if (default_service == NULL)
+                               default_service = service;
+               } else if (service->type == CONNMAN_SERVICE_TYPE_BLUETOOTH &&
+                               is_connected(service->state) == TRUE) {
+                       if (default_service == NULL)
+                               default_service = service;
+               }
+       }
+
+       return default_service;
+}
+
+struct connman_service *connman_service_get_connected_service(const char *ifname)
+{
+       GList *list;
+       const char *svc_ifname;
+       struct connman_service *service;
+
+       if (!ifname)
+               return NULL;
+
+       for (list = service_list; list; list = list->next) {
+               service = list->data;
+
+               if (!is_connected(service->state))
+                       continue;
+
+               svc_ifname = connman_device_get_string(
+                               connman_network_get_device(service->network), "Interface");
+
+               if (svc_ifname && g_strcmp0(svc_ifname, ifname) == 0)
+                       return service;
+       }
+
+       return NULL;
+}
+#endif
+
 struct connman_service *connman_service_get_default(void)
 {
+#if defined TIZEN_MAINTAIN_ONLINE
+       return connman_service_get_default_connection();
+#else
        struct connman_service *service;
 
        if (!service_list)
@@ -1537,6 +3013,7 @@ struct connman_service *connman_service_get_default(void)
                return NULL;
 
        return service;
+#endif
 }
 
 bool __connman_service_index_is_default(int index)
@@ -1553,7 +3030,11 @@ bool __connman_service_index_is_default(int index)
 
 static void default_changed(void)
 {
+#if defined TIZEN_EXT
+       struct connman_service *service = connman_service_get_default_connection();
+#else
        struct connman_service *service = connman_service_get_default();
+#endif
 
        if (service == current_default)
                return;
@@ -1562,9 +3043,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 &&
@@ -1575,6 +3062,16 @@ static void default_changed(void)
                                connman_setting_get_bool("AllowDomainnameUpdates"))
                        __connman_utsname_set_domainname(service->domainname);
 
+               if (__connman_service_is_connected_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4))
+                       __connman_service_wispr_start(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV4);
+
+               if (__connman_service_is_connected_state(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6))
+                       __connman_service_wispr_start(service,
+                                               CONNMAN_IPCONFIG_TYPE_IPV6);
+
                /*
                 * Connect VPN automatically when new default service
                 * is set and connected, unless new default is VPN
@@ -1589,23 +3086,166 @@ static void default_changed(void)
        __connman_notifier_default_changed(service);
 }
 
-static void state_changed(struct connman_service *service)
+#if defined TIZEN_EXT
+static void append_struct(gpointer value, gpointer user_data);
+
+static void emit_state_changed_with_properties(struct connman_service *service)
+{
+       DBusMessage *signal;
+       DBusMessageIter iter;
+
+       if (!service)
+               return;
+
+       signal = dbus_message_new_signal(service->path, CONNMAN_SERVICE_INTERFACE,
+                       "StateChangedProperties");
+       if (!signal)
+               return;
+
+       dbus_message_iter_init_append(signal, &iter);
+       append_struct(service, &iter);
+
+       g_dbus_send_message(connection, signal);
+
+       return;
+}
+#endif
+
+static void state_changed(struct connman_service *service)
+{
+       const char *str;
+
+       __connman_notifier_service_state_changed(service, service->state);
+
+       str = state2string(service->state);
+       if (!str)
+               return;
+
+#if !defined TIZEN_EXT
+       if (!allow_property_changed(service))
+               return;
+#else
+       DBG(" %s, %s", str, service->path);
+#endif
+
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "State",
+                                               DBUS_TYPE_STRING, &str);
+
+#if defined TIZEN_EXT
+       emit_state_changed_with_properties(service);
+#endif
+}
+
+#if defined TIZEN_EXT
+static void connect_reason_changed(struct connman_service *service)
+{
+#if defined TIZEN_EXT_INS
+       struct connman_device *device;
+#endif
+       if (!service->path)
+               return;
+
+       if (!allow_property_changed(service))
+               return;
+
+#if defined TIZEN_EXT_INS
+       if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_USER) {
+               device = connman_network_get_device(service->network);
+               if (device) {
+                       bool need_save = false;
+
+                       need_save |= connman_device_set_last_user_selection_ident(device, service->identifier);
+                       need_save |= connman_device_set_last_user_selection_time(device, time(NULL));
+
+                       DBG("last user selection ident[%s] time[%ld]",
+                               connman_device_get_last_user_selection_ident(device),
+                               connman_device_get_last_user_selection_time(device));
+
+                       if (need_save)
+                               connman_device_save_last_user_selection(device);
+               }
+       }
+#endif
+
+       connman_dbus_property_changed_basic(service->path,
+                                       CONNMAN_SERVICE_INTERFACE,
+                                       "ConnectReason",
+                                       DBUS_TYPE_INT32,
+                                       &service->connect_reason);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
+#if defined TIZEN_EXT
+static void disconnection_requested_changed(struct connman_service *service)
+{
+       dbus_bool_t disconnection_requested;
+
+       if (!service->path)
+               return;
+
+       if (!allow_property_changed(service))
+               return;
+
+       disconnection_requested = service->disconnection_requested;
+       connman_dbus_property_changed_basic(service->path,
+                                           CONNMAN_SERVICE_INTERFACE,
+                                           "DisconnectionRequested",
+                                           DBUS_TYPE_BOOLEAN,
+                                           &disconnection_requested);
+}
+
+void connman_service_set_disconnection_requested(struct connman_service *service,
+                                               bool disconnection_requested)
+{
+       if (service == NULL)
+               return;
+
+       service->disconnection_requested = disconnection_requested;
+       disconnection_requested_changed(service);
+}
+
+static void connman_service_emit_state(struct connman_service *service,
+                                               enum connman_service_state state)
+{
+       const char *str;
+       enum connman_service_state cur_state = service->state;
+
+       if (service->state != state)
+               service->state = state;
+
+       str = state2string(service->state);
+       if (!str) {
+               service->state = cur_state;
+               return;
+       }
+
+       DBG(" %s, %s", str, service->path);
+
+       connman_dbus_property_changed_basic(service->path,
+                               CONNMAN_SERVICE_INTERFACE, "State",
+                                               DBUS_TYPE_STRING, &str);
+
+       emit_state_changed_with_properties(service);
+       service->state = cur_state;
+}
+
+void connman_service_notify_reconnection(struct connman_service *service)
 {
-       const char *str;
-
-       __connman_notifier_service_state_changed(service, service->state);
-
-       str = state2string(service->state);
-       if (!str)
+       if (!service)
                return;
 
-       if (!allow_property_changed(service))
+       if (service->state != CONNMAN_SERVICE_STATE_READY &&
+                       service->state != CONNMAN_SERVICE_STATE_ONLINE)
                return;
 
-       connman_dbus_property_changed_basic(service->path,
-                               CONNMAN_SERVICE_INTERFACE, "State",
-                                               DBUS_TYPE_STRING, &str);
+       connman_service_emit_state(service, CONNMAN_SERVICE_STATE_CONFIGURATION);
+       connman_service_emit_state(service, CONNMAN_SERVICE_STATE_READY);
+
+       if (service->state == CONNMAN_SERVICE_STATE_ONLINE)
+               connman_service_emit_state(service, CONNMAN_SERVICE_STATE_ONLINE);
 }
+#endif
 
 static void strength_changed(struct connman_service *service)
 {
@@ -1620,6 +3260,27 @@ static void strength_changed(struct connman_service *service)
                                        DBUS_TYPE_BYTE, &service->strength);
 }
 
+#if defined TIZEN_EXT
+static bool update_last_connected_bssid(struct connman_service *service)
+{
+       const unsigned char *last_connected_bssid;
+
+       if (!service->network)
+               return false;
+
+       last_connected_bssid = connman_network_get_last_connected_bssid(service->network);
+       if (memcmp(last_connected_bssid, invalid_bssid, WIFI_BSSID_LEN_MAX) == 0)
+               return false;
+
+       if (memcmp(last_connected_bssid, service->last_connected_bssid, WIFI_BSSID_LEN_MAX) != 0) {
+               memcpy(service->last_connected_bssid, last_connected_bssid, WIFI_BSSID_LEN_MAX);
+               return true;
+       }
+
+       return false;
+}
+#endif
+
 static void favorite_changed(struct connman_service *service)
 {
        dbus_bool_t favorite;
@@ -1693,6 +3354,8 @@ bool connman_service_set_autoconnect(struct connman_service *service,
        service->autoconnect = autoconnect;
        autoconnect_changed(service);
 
+       connman_network_set_autoconnect(service->network, autoconnect);
+
        return true;
 }
 
@@ -1716,10 +3379,16 @@ static void append_security(DBusMessageIter *iter, void *user_data)
                case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_SAE:
+#endif
                        str = "wps";
                        dbus_message_iter_append_basic(iter,
                                                DBUS_TYPE_STRING, &str);
                        break;
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_OWE:
+#endif
                case CONNMAN_SERVICE_SECURITY_UNKNOWN:
                case CONNMAN_SERVICE_SECURITY_NONE:
                case CONNMAN_SERVICE_SECURITY_WEP:
@@ -1760,6 +3429,57 @@ static void append_ethernet(DBusMessageIter *iter, void *user_data)
                                                                        iter);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static void append_eap_over_ethernet(DBusMessageIter *iter, void *user_data)
+{
+       struct connman_service *service = user_data;
+       dbus_bool_t val;
+
+       val = service->use_eapol;
+       connman_dbus_dict_append_basic(iter, "UseEapol",
+                       DBUS_TYPE_BOOLEAN, &val);
+       if (service->use_eapol) {
+               if (service->eap)
+                       connman_dbus_dict_append_basic(iter, "EAP",
+                                       DBUS_TYPE_STRING, &service->eap);
+
+               if (service->identity)
+                       connman_dbus_dict_append_basic(iter, "Identity",
+                                       DBUS_TYPE_STRING, &service->identity);
+
+               if (service->anonymous_identity)
+                       connman_dbus_dict_append_basic(iter, "AnonymousIdentity",
+                                       DBUS_TYPE_STRING, &service->anonymous_identity);
+
+               if (service->ca_cert_file)
+                       connman_dbus_dict_append_basic(iter, "CACertFile",
+                                       DBUS_TYPE_STRING, &service->ca_cert_file);
+
+               if (service->client_cert_file)
+                       connman_dbus_dict_append_basic(iter, "ClientCertFile",
+                                       DBUS_TYPE_STRING, &service->client_cert_file);
+
+               if (service->private_key_file)
+                       connman_dbus_dict_append_basic(iter, "PrivateKeyFile",
+                                       DBUS_TYPE_STRING, &service->private_key_file);
+
+               if (service->phase2)
+                       connman_dbus_dict_append_basic(iter, "Phase2",
+                                       DBUS_TYPE_STRING, &service->phase2);
+
+               if (service->phase1)
+                       connman_dbus_dict_append_basic(iter, "Phase1",
+                                       DBUS_TYPE_STRING, &service->phase1);
+
+               if (service->pac_file)
+                       connman_dbus_dict_append_basic(iter, "PacFile",
+                                       DBUS_TYPE_STRING, &service->pac_file);
+
+               /* Should we include passphrase? */
+       }
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static void append_ipv4(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
@@ -1819,20 +3539,143 @@ static void append_nameservers(DBusMessageIter *iter,
        }
 }
 
+#if defined TIZEN_EXT
+static void append_nameserver_manual(DBusMessageIter *iter,
+               struct connman_service *service, const char *server)
+{
+       bool available = true;
+
+       if (service)
+               available = nameserver_available(service,
+                               CONNMAN_IPCONFIG_TYPE_ALL, server);
+
+       if (available)
+               dbus_message_iter_append_basic(iter,
+                               DBUS_TYPE_STRING, &server);
+}
+
+static void append_nameserver_dhcp(DBusMessageIter *iter,
+               struct connman_service *service, const char *server)
+{
+       bool available = true;
+
+       if (service)
+               available = nameserver_available(service,
+                               CONNMAN_IPCONFIG_TYPE_ALL, server);
+
+       if (available)
+               dbus_message_iter_append_basic(iter,
+                               DBUS_TYPE_STRING, &server);
+}
+#endif
+
 static void append_dns(DBusMessageIter *iter, void *user_data)
 {
        struct connman_service *service = user_data;
+#if defined TIZEN_EXT
+       int i;
+#endif
 
        if (!is_connected(service->state))
                return;
 
+#ifdef TIZEN_EXT
+       const char *str;
+
+       str = __connman_dnsconfig_method2string(service->dns_config_method_ipv4);
+       if(str != NULL) {
+               char *str1 = g_strdup_printf("ipv4.%s", str);
+               dbus_message_iter_append_basic(iter,
+                       DBUS_TYPE_STRING, &str1);
+               g_free(str1);
+       }
+
+       str = __connman_dnsconfig_method2string(service->dns_config_method_ipv6);
+       if(str != NULL) {
+               char *str1 = g_strdup_printf("ipv6.%s", str);
+               dbus_message_iter_append_basic(iter,
+                       DBUS_TYPE_STRING, &str1);
+               g_free(str1);
+       }
+#endif
+
        if (service->nameservers_config) {
+#if defined TIZEN_EXT
+               i = 0;
+               while (service->nameservers_config[i]) {
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET &&
+                               service->dns_config_method_ipv4 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                               append_nameserver_manual(iter, service,
+                                               service->nameservers_config[i]);
+                       }
+
+                       if (connman_inet_check_ipaddress(
+                               service->nameservers_config[i]) == AF_INET6 &&
+                               service->dns_config_method_ipv6 ==
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                               append_nameserver_manual(iter, service,
+                                               service->nameservers_config[i]);
+                       }
+                       i++;
+               }
+               /* In case of mixed DNS Config Type one of IPv4/IPv6 can be
+                * dynamic while other is static so try to append the DNS
+                * Address which is dynamic also */
+               if (service->nameservers != NULL) {
+                       i = 0;
+                       while (service->nameservers[i]) {
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       append_nameserver_dhcp(iter, service,
+                                                       service->nameservers[i]);
+                               }
+
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       append_nameserver_dhcp(iter, service,
+                                                       service->nameservers[i]);
+                               }
+                               i++;
+                       }
+               }
+#else
                append_nameservers(iter, service, service->nameservers_config);
+#endif
                return;
        } else {
                if (service->nameservers)
+#if defined TIZEN_EXT
+               {
+                       i = 0;
+                       while (service->nameservers[i]) {
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET &&
+                                       service->dns_config_method_ipv4 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       append_nameserver_dhcp(iter, service,
+                                                       service->nameservers[i]);
+                               }
+
+                               if (connman_inet_check_ipaddress(
+                                       service->nameservers[i]) == AF_INET6 &&
+                                       service->dns_config_method_ipv6 ==
+                                               CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       append_nameserver_dhcp(iter, service,
+                                                       service->nameservers[i]);
+                               }
+                               i++;
+                       }
+               }
+#else
                        append_nameservers(iter, service,
                                        service->nameservers);
+#endif
 
                if (service->nameservers_auto)
                        append_nameservers(iter, service,
@@ -1854,10 +3697,46 @@ 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;
+       str = __connman_dnsconfig_method2string(service->dns_config_method_ipv4);
+       if(str != NULL) {
+               char *str1 = g_strdup_printf("ipv4.%s", str);
+               dbus_message_iter_append_basic(iter,
+                       DBUS_TYPE_STRING, &str1);
+               g_free(str1);
+       }
+
+       str = __connman_dnsconfig_method2string(service->dns_config_method_ipv6);
+       if(str != NULL) {
+               char *str1 = g_strdup_printf("ipv6.%s", str);
+               dbus_message_iter_append_basic(iter,
+                       DBUS_TYPE_STRING, &str1);
+               g_free(str1);
+       }
+#endif
+
        if (!service->nameservers_config)
                return;
 
+#if defined TIZEN_EXT
+       int i = 0;
+       while (service->nameservers_config[i]) {
+               if (connman_inet_check_ipaddress(service->nameservers_config[i]) == AF_INET &&
+                               service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                       append_nameserver_manual(iter, NULL, service->nameservers_config[i]);
+               }
+
+               if (connman_inet_check_ipaddress(service->nameservers_config[i]) == AF_INET6 &&
+                               service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                       append_nameserver_manual(iter, NULL, service->nameservers_config[i]);
+               }
+               i++;
+       }
+#else
        append_nameservers(iter, NULL, service->nameservers_config);
+#endif
 }
 
 static void append_ts(DBusMessageIter *iter, void *user_data)
@@ -2472,6 +4351,154 @@ int connman_service_iterate_services(connman_service_iterate_cb cb,
        return ret;
 }
 
+#if defined TIZEN_EXT
+static void append_security_list(DBusMessageIter *iter, void *user_data)
+{
+       GSList *sec_list = (GSList *)user_data;
+       const char *sec_str;
+
+       if (sec_list) {
+               GSList *list;
+               for (list = sec_list; list; list = list->next) {
+                       sec_str = (const char *)list->data;
+
+                       dbus_message_iter_append_basic(iter,
+                                       DBUS_TYPE_STRING, &sec_str);
+               }
+       }
+}
+
+static void append_wifi_ext_info(DBusMessageIter *dict,
+                                       struct connman_network *network)
+{
+       char bssid_buff[WIFI_BSSID_STR_LEN] = {0,};
+       char *bssid_str = bssid_buff;
+       const void *ssid;
+       unsigned int ssid_len;
+       unsigned char *bssid;
+       unsigned int maxrate;
+       int maxspeed;
+       unsigned int keymgmt;
+       uint16_t frequency;
+       const char *enc_mode;
+       const char *str;
+       gboolean passpoint;
+       gboolean pmf_required;
+       char country_code_buff[WIFI_COUNTRY_CODE_LEN + 1] = {0,};
+       char *country_code_str = country_code_buff;
+       unsigned char *country_code;
+       uint16_t connection_mode;
+       GSList *sec_list = NULL;
+
+       ssid = connman_network_get_blob(network, "WiFi.SSID", &ssid_len);
+       bssid = connman_network_get_bssid(network);
+       maxrate = connman_network_get_maxrate(network);
+       maxspeed = connman_network_get_maxspeed(network);
+       frequency = connman_network_get_frequency(network);
+       enc_mode = connman_network_get_enc_mode(network);
+       passpoint = connman_network_get_bool(network, "WiFi.HS20AP");
+       keymgmt = connman_network_get_keymgmt(network);
+       pmf_required = connman_network_get_bool(network, "WiFi.PMFRequired");
+       country_code = connman_network_get_countrycode(network);
+       connection_mode = connman_network_get_connection_mode(network);
+       sec_list = (GSList *)connman_network_get_sec_list(network);
+
+       snprintf(bssid_str, WIFI_BSSID_STR_LEN, MACSTR, MAC2STR(bssid));
+
+       snprintf(country_code_str, (WIFI_COUNTRY_CODE_LEN + 1), "%c%c",
+                country_code[0], country_code[1]);
+
+       connman_dbus_dict_append_array(dict, "SecurityList",
+                                       DBUS_TYPE_STRING,
+                                       append_security_list, sec_list);
+
+       connman_dbus_dict_append_fixed_array(dict, "SSID",
+                                       DBUS_TYPE_BYTE, &ssid, ssid_len);
+       connman_dbus_dict_append_basic(dict, "BSSID",
+                                       DBUS_TYPE_STRING, &bssid_str);
+       connman_dbus_dict_append_basic(dict, "MaxRate",
+                                       DBUS_TYPE_UINT32, &maxrate);
+       connman_dbus_dict_append_basic(dict, "MaxSpeed",
+                                       DBUS_TYPE_INT32, &maxspeed);
+       connman_dbus_dict_append_basic(dict, "Frequency",
+                                       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);
+       connman_dbus_dict_append_basic(dict, "PmfReq",
+                                       DBUS_TYPE_BOOLEAN, &pmf_required);
+       connman_dbus_dict_append_basic(dict, "Country", DBUS_TYPE_STRING,
+                                      &country_code_str);
+       connman_dbus_dict_append_basic(dict, "ConnMode",
+                                       DBUS_TYPE_UINT16, &connection_mode);
+
+       str = connman_network_get_string(network, "WiFi.Security");
+       if (str != NULL && g_str_equal(str, "ieee8021x") == TRUE) {
+               str = connman_network_get_string(network, "WiFi.EAP");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "EAP",
+                                       DBUS_TYPE_STRING, &str);
+
+               str = connman_network_get_string(network, "WiFi.Phase2");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "Phase2",
+                                       DBUS_TYPE_STRING, &str);
+
+               str = connman_network_get_string(network, "WiFi.Identity");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "Identity",
+                                       DBUS_TYPE_STRING, &str);
+
+               str = connman_network_get_string(network, "WiFi.CACertFile");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "CACertFile",
+                                       DBUS_TYPE_STRING, &str);
+
+               str = connman_network_get_string(network,
+                               "WiFi.ClientCertFile");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "ClientCertFile",
+                                       DBUS_TYPE_STRING, &str);
+
+               str = connman_network_get_string(network,
+                               "WiFi.PrivateKeyFile");
+               if (str != NULL)
+                       connman_dbus_dict_append_basic(dict, "PrivateKeyFile",
+                                       DBUS_TYPE_STRING, &str);
+       }
+}
+
+static void append_bssid_info(DBusMessageIter *iter, void *user_data)
+{
+       GSList *bssid_list = NULL;
+       struct connman_network *network = user_data;
+       struct connman_bssids *bssids;
+       char bssid_buf[MAC_ADDRESS_LENGTH] = {0,};
+       char *bssid_str = bssid_buf;
+
+       bssid_list = (GSList *)connman_network_get_bssid_list(network);
+       if(bssid_list) {
+               GSList *list;
+               for (list = bssid_list; list; list = list->next) {
+                       bssids = (struct connman_bssids *)list->data;
+                       g_snprintf(bssid_buf, MAC_ADDRESS_LENGTH, MACSTR, MAC2STR(bssids->bssid));
+
+                       connman_dbus_dict_append_basic(iter, "BSSID",
+                                       DBUS_TYPE_STRING, &bssid_str);
+
+                       connman_dbus_dict_append_basic(iter, "Strength",
+                                       DBUS_TYPE_UINT16, &bssids->strength);
+
+                       connman_dbus_dict_append_basic(iter, "Frequency",
+                                       DBUS_TYPE_UINT16, &bssids->frequency);
+               }
+       }
+}
+#endif
+
 static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                                        struct connman_service *service)
 {
@@ -2479,6 +4506,31 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
        const char *str;
        GSList *list;
 
+#if defined TIZEN_EXT
+       unsigned int frequency = 0U;
+       unsigned char *wifi_vsie;
+       unsigned int wifi_vsie_len;
+       GSList *vsie_list = NULL;
+
+       if (service->network) {
+               frequency = connman_network_get_frequency(service->network);
+               connman_dbus_dict_append_basic(dict, "Frequency",
+                               DBUS_TYPE_UINT16, &frequency);
+               vsie_list = (GSList *)connman_network_get_vsie_list(service->network);
+       }
+
+       if (vsie_list) {
+               GSList *list;
+               for (list = vsie_list; list; list = list->next) {
+                       wifi_vsie = (unsigned char *)list->data;
+                       wifi_vsie_len = wifi_vsie[1] + 2;
+
+                       connman_dbus_dict_append_fixed_array(dict, "Vsie", DBUS_TYPE_BYTE,
+                                       &wifi_vsie, wifi_vsie_len);
+               }
+       }
+#endif
+
        str = __connman_service_type2string(service->type);
        if (str)
                connman_dbus_dict_append_basic(dict, "Type",
@@ -2492,6 +4544,13 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_dbus_dict_append_basic(dict, "State",
                                                DBUS_TYPE_STRING, &str);
 
+#ifdef TIZEN_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",
@@ -2527,6 +4586,9 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_VPN:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                break;
        case CONNMAN_SERVICE_TYPE_CELLULAR:
                val = service->roaming;
@@ -2537,7 +4599,35 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                                                append_ethernet, service);
                break;
        case CONNMAN_SERVICE_TYPE_WIFI:
+#if defined TIZEN_EXT
+               if (service->network != NULL) {
+                       append_wifi_ext_info(dict, service->network);
+                       connman_dbus_dict_append_dict(dict, "BSSID.List",
+                                       append_bssid_info, service->network);
+               }
+
+               connman_dbus_dict_append_dict(dict, "Ethernet",
+                                               append_ethernet, service);
+
+               service->disconnect_reason = connman_network_get_disconnect_reason(service->network);
+               connman_dbus_dict_append_basic(dict, "DisconnectReason",
+                               DBUS_TYPE_INT32, &service->disconnect_reason);
+
+               connman_dbus_dict_append_basic(dict, "AssocStatusCode",
+                               DBUS_TYPE_INT32, &service->assoc_status_code);
+
+               val = service->hidden_service;
+               connman_dbus_dict_append_basic(dict, "Hidden",
+                               DBUS_TYPE_BOOLEAN, &val);
+
+               break;
+#endif
        case CONNMAN_SERVICE_TYPE_ETHERNET:
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+               connman_dbus_dict_append_dict(dict, "EapOverEthernet",
+                                               append_eap_over_ethernet, service);
+               /* fall through */
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
        case CONNMAN_SERVICE_TYPE_BLUETOOTH:
        case CONNMAN_SERVICE_TYPE_GADGET:
                connman_dbus_dict_append_dict(dict, "Ethernet",
@@ -2601,6 +4691,99 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
                connman_network_append_acddbus(dict, service->network);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static void append_ins_bssid_info(DBusMessageIter *iter, void *user_data)
+{
+       GSList *bssid_list = NULL;
+       struct connman_network *network = user_data;
+       struct connman_bssids *bssids;
+       char bssid_buf[MAC_ADDRESS_LENGTH] = {0,};
+       char *bssid_str = bssid_buf;
+
+       bssid_list = (GSList *)connman_network_get_bssid_list(network);
+       if(bssid_list) {
+               GSList *list;
+               for (list = bssid_list; list; list = list->next) {
+                       bssids = (struct connman_bssids *)list->data;
+                       g_snprintf(bssid_buf, MAC_ADDRESS_LENGTH, MACSTR, MAC2STR(bssids->bssid));
+
+                       connman_dbus_dict_append_basic(iter, "BSSID",
+                                       DBUS_TYPE_STRING, &bssid_str);
+
+                       connman_dbus_dict_append_basic(iter, "ScoreINS",
+                                       DBUS_TYPE_INT32, &bssids->ins_score);
+
+                       connman_dbus_dict_append_basic(iter, "ScoreLastConnected",
+                                       DBUS_TYPE_INT32, &bssids->score_last_connected_bssid);
+
+                       connman_dbus_dict_append_basic(iter, "ScoreAssocReject",
+                                       DBUS_TYPE_INT32, &bssids->score_assoc_reject);
+
+                       connman_dbus_dict_append_basic(iter, "Frequency",
+                                       DBUS_TYPE_UINT16, &bssids->frequency);
+
+                       connman_dbus_dict_append_basic(iter, "ScoreFrequency",
+                                       DBUS_TYPE_INT32, &bssids->score_frequency);
+
+                       connman_dbus_dict_append_basic(iter, "Strength",
+                                       DBUS_TYPE_UINT16, &bssids->strength);
+
+                       connman_dbus_dict_append_basic(iter, "ScoreStrength",
+                                       DBUS_TYPE_INT32, &bssids->score_strength);
+               }
+       }
+}
+
+static void append_ins_properties(DBusMessageIter *dict,
+                                       struct connman_service *service)
+{
+       const char *str;
+       unsigned int frequency = 0U;
+
+       if (service->name)
+               connman_dbus_dict_append_basic(dict, "Name",
+                                       DBUS_TYPE_STRING, &service->name);
+
+       connman_dbus_dict_append_basic(dict, "ScoreINS",
+                               DBUS_TYPE_INT32, &service->ins_score);
+
+       connman_dbus_dict_append_basic(dict, "ScoreLastUserSelection",
+                               DBUS_TYPE_INT32, &service->score_last_user_selection);
+
+       connman_dbus_dict_append_basic(dict, "ScoreLastConnected",
+                               DBUS_TYPE_INT32, &service->score_last_connected);
+
+       str = security2string(service->security);
+       if (str)
+               connman_dbus_dict_append_basic(dict, "Security",
+                               DBUS_TYPE_STRING, &str);
+
+       connman_dbus_dict_append_basic(dict, "ScoreSecurityPriority",
+                               DBUS_TYPE_INT32, &service->score_security_priority);
+
+       connman_dbus_dict_append_basic(dict, "Strength",
+                               DBUS_TYPE_BYTE, &service->strength);
+
+       connman_dbus_dict_append_basic(dict, "ScoreStrength",
+                               DBUS_TYPE_INT32, &service->score_strength);
+
+       connman_dbus_dict_append_basic(dict, "ScoreInternetConnection",
+                               DBUS_TYPE_INT32, &service->score_internet_connection);
+
+       if (service->network) {
+               frequency = connman_network_get_frequency(service->network);
+               connman_dbus_dict_append_basic(dict, "Frequency",
+                               DBUS_TYPE_UINT16, &frequency);
+
+               connman_dbus_dict_append_basic(dict, "ScoreFrequency",
+                               DBUS_TYPE_INT32, &service->score_frequency);
+
+               connman_dbus_dict_append_dict(dict, "BSSID.List",
+                               append_ins_bssid_info, service->network);
+       }
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
 static void append_struct_service(DBusMessageIter *iter,
                connman_dbus_append_cb_t function,
                struct connman_service *service)
@@ -2638,6 +4821,34 @@ static void append_struct(gpointer value, gpointer user_data)
        append_struct_service(iter, append_dict_properties, service);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static void append_dict_ins_properties(DBusMessageIter *dict, void *user_data)
+{
+       struct connman_service *service = user_data;
+
+       append_ins_properties(dict, service);
+}
+
+static void append_ins_struct(gpointer value, gpointer user_data)
+{
+       struct connman_service *service = value;
+       DBusMessageIter *iter = user_data;
+
+       if (!service->path)
+               return;
+
+       if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+               return;
+
+       append_struct_service(iter, append_dict_ins_properties, service);
+}
+
+void __connman_ins_list_struct(DBusMessageIter *iter)
+{
+       g_list_foreach(service_list, append_ins_struct, iter);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
 void __connman_service_list_struct(DBusMessageIter *iter)
 {
        g_list_foreach(service_list, append_struct, iter);
@@ -2794,6 +5005,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)
 {
@@ -2822,26 +5081,74 @@ enum connman_service_proxy_method connman_service_get_proxy_method(
                return service->proxy_config;
        }
 
-       return service->proxy;
+       return service->proxy;
+}
+
+char **connman_service_get_proxy_servers(struct connman_service *service)
+{
+       return g_strdupv(service->proxies);
+}
+
+char **connman_service_get_proxy_excludes(struct connman_service *service)
+{
+       return g_strdupv(service->excludes);
+}
+
+const char *connman_service_get_proxy_url(struct connman_service *service)
+{
+       if (!service)
+               return NULL;
+
+       return service->pac;
 }
 
-char **connman_service_get_proxy_servers(struct connman_service *service)
+#if defined TIZEN_EXT
+void connman_service_set_internet_connection(struct connman_service *service,
+                                                       bool internet_connection)
 {
-       return g_strdupv(service->proxies);
+       if (!service)
+               return;
+
+       if (service->is_internet_connection != internet_connection) {
+               service->is_internet_connection = internet_connection;
+
+               g_get_current_time(&service->modified);
+               service_save(service);
+       }
 }
 
-char **connman_service_get_proxy_excludes(struct connman_service *service)
+bool connman_service_get_internet_connection(struct connman_service *service)
 {
-       return g_strdupv(service->excludes);
+       if (!service)
+               return false;
+
+       return service->is_internet_connection;
 }
 
-const char *connman_service_get_proxy_url(struct connman_service *service)
+DBusMessage *connman_service_create_dbus_service_reply(DBusMessage *msg,
+                                                       struct connman_service *service)
 {
-       if (!service)
+       DBusMessage *reply;
+       DBusMessageIter array, dict;
+
+       reply = dbus_message_new_method_return(msg);
+       if (!reply)
                return NULL;
 
-       return service->pac;
+       dbus_message_iter_init_append(reply, &array);
+
+       if (service)
+               dbus_message_iter_append_basic(&array, DBUS_TYPE_OBJECT_PATH,
+                                                               &service->path);
+
+       connman_dbus_dict_open(&array, &dict);
+       if (service)
+               append_properties(&dict, FALSE, service);
+       connman_dbus_dict_close(&array, &dict);
+
+       return reply;
 }
+#endif
 
 void __connman_service_set_proxy_autoconfig(struct connman_service *service,
                                                        const char *url)
@@ -2881,6 +5188,18 @@ const char *connman_service_get_proxy_autoconfig(struct connman_service *service
        return NULL;
 }
 
+#if defined TIZEN_EXT
+int connman_service_get_ipv6_dns_method(struct connman_service *service)
+{
+       if (!service) {
+               DBG("Service is NULL");
+               return -1;
+       }
+
+       return service->dns_config_method_ipv6;
+}
+#endif
+
 void __connman_service_set_timeservers(struct connman_service *service,
                                char **timeservers)
 {
@@ -3008,6 +5327,22 @@ void __connman_service_set_pac(struct connman_service *service,
        proxy_changed(service);
 }
 
+#if defined TIZEN_EXT
+void __connman_service_set_proxy(struct connman_service *service,
+                                       const char *proxies)
+{
+       char **proxies_array = NULL;
+
+       g_strfreev(service->proxies);
+       service->proxies = NULL;
+
+       if (proxies != NULL)
+               proxies_array = g_strsplit(proxies, " ", 0);
+
+       service->proxies = proxies_array;
+}
+#endif
+
 void __connman_service_set_identity(struct connman_service *service,
                                        const char *identity)
 {
@@ -3127,7 +5462,9 @@ int __connman_service_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);
@@ -3135,6 +5472,11 @@ int __connman_service_check_passphrase(enum connman_service_security security,
                return -EOPNOTSUPP;
 
        case CONNMAN_SERVICE_SECURITY_PSK:
+#if defined TIZEN_EXT
+       case CONNMAN_SERVICE_SECURITY_RSN:
+       /* TO CHECK: We need to check the key length supported by SAE */
+       case CONNMAN_SERVICE_SECURITY_SAE:
+#endif
                /* A raw key is always 64 bytes length,
                 * its content is in hex representation.
                 * A PSK key must be between [8..63].
@@ -3161,6 +5503,10 @@ int __connman_service_check_passphrase(enum connman_service_security security,
                break;
 
        case CONNMAN_SERVICE_SECURITY_8021X:
+#if defined TIZEN_EXT
+       case CONNMAN_SERVICE_SECURITY_OWE:
+       case CONNMAN_SERVICE_SECURITY_DPP:
+#endif
                break;
        }
 
@@ -3179,6 +5525,19 @@ int __connman_service_set_passphrase(struct connman_service *service,
                        service->security != CONNMAN_SERVICE_SECURITY_8021X)
                return -EINVAL;
 
+#if defined TIZEN_EXT
+       if (service->immutable &&
+                       service->security != CONNMAN_SERVICE_SECURITY_DPP)
+               return -EINVAL;
+       /* The encrypted passphrase is used here
+        * and validation is done by net-config before being encrypted.
+        */
+       err = 0;
+       if (service->security != CONNMAN_SERVICE_SECURITY_PSK &&
+                       service->security != CONNMAN_SERVICE_SECURITY_RSN &&
+                       service->security != CONNMAN_SERVICE_SECURITY_SAE &&
+                       service->security != CONNMAN_SERVICE_SECURITY_WEP)
+#endif
        err = __connman_service_check_passphrase(service->security, passphrase);
 
        if (err < 0)
@@ -3202,6 +5561,28 @@ const char *__connman_service_get_passphrase(struct connman_service *service)
        return service->passphrase;
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+int __connman_service_get_use_eapol(struct connman_service *service)
+{
+       if (!service) {
+               DBG("Service is NULL");
+               return -1;
+       }
+
+       return service->use_eapol;
+}
+
+int __connman_service_get_connect_reason(struct connman_service *service)
+{
+       if (!service) {
+               DBG("Service is NULL");
+               return -1;
+       }
+
+       return service->connect_reason;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static DBusMessage *get_properties(DBusConnection *conn,
                                        DBusMessage *msg, void *user_data)
 {
@@ -3428,15 +5809,28 @@ static void do_auto_connect(struct connman_service *service,
                return;
 
        /*
+        * Only user interaction should get VPN or WIFI connected in failure
+        * state.
+        */
+       if (service->state == CONNMAN_SERVICE_STATE_FAILURE &&
+                               reason != CONNMAN_SERVICE_CONNECT_REASON_USER &&
+                               (service->type == CONNMAN_SERVICE_TYPE_VPN ||
+                               service->type == CONNMAN_SERVICE_TYPE_WIFI))
+               return;
+
+       /*
+        * Do not use the builtin auto connect, instead rely on the
+        * native auto connect feature of the service.
+        */
+       if (service->connect_reason == CONNMAN_SERVICE_CONNECT_REASON_NATIVE)
+               return;
+
+       /*
         * Run service auto connect for other than VPN services. Afterwards
         * start also VPN auto connect process.
         */
        if (service->type != CONNMAN_SERVICE_TYPE_VPN)
                __connman_service_auto_connect(reason);
-       /* Only user interaction should get VPN connected in failure state. */
-       else if (service->state == CONNMAN_SERVICE_STATE_FAILURE &&
-                               reason != CONNMAN_SERVICE_CONNECT_REASON_USER)
-               return;
 
        vpn_auto_connect();
 }
@@ -3515,14 +5909,6 @@ int __connman_service_reset_ipconfig(struct connman_service *service,
        return err;
 }
 
-/*
- * We set the timeout to 1 sec so that we have a chance to get
- * necessary IPv6 router advertisement messages that might have
- * DNS data etc.
- */
-#define ONLINE_CHECK_INITIAL_INTERVAL 1
-#define ONLINE_CHECK_MAX_INTERVAL 12
-
 void __connman_service_wispr_start(struct connman_service *service,
                                        enum connman_ipconfig_type type)
 {
@@ -3530,10 +5916,10 @@ void __connman_service_wispr_start(struct connman_service *service,
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
                service->online_check_interval_ipv4 =
-                                       ONLINE_CHECK_INITIAL_INTERVAL;
+                                       online_check_initial_interval;
        else
                service->online_check_interval_ipv6 =
-                                       ONLINE_CHECK_INITIAL_INTERVAL;
+                                       online_check_initial_interval;
 
        __connman_wispr_start(service, type);
 }
@@ -3603,6 +5989,10 @@ static DBusMessage *set_property(DBusConnection *conn,
                GString *str;
                int index;
                const char *gw;
+#if defined TIZEN_EXT
+               enum connman_ipconfig_type ip_type = CONNMAN_IPCONFIG_TYPE_ALL;
+               DBG("%s", name);
+#endif
 
                if (__connman_provider_is_immutable(service->provider) ||
                                service->immutable)
@@ -3619,17 +6009,65 @@ static DBusMessage *set_property(DBusConnection *conn,
                gw = __connman_ipconfig_get_gateway_from_index(index,
                        CONNMAN_IPCONFIG_TYPE_ALL);
 
+#if !defined TIZEN_EXT
                if (gw && strlen(gw))
                        __connman_service_nameserver_del_routes(service,
                                                CONNMAN_IPCONFIG_TYPE_ALL);
 
+#endif
                dbus_message_iter_recurse(&value, &entry);
 
+#if defined TIZEN_EXT
+               /* IPv4/IPv6 Last DNS config method */
+               int last_dns_ipv4 = service->dns_config_method_ipv4;
+               int last_dns_ipv6 = service->dns_config_method_ipv6;
+               DBG("Last DNS Config Method IPv4: %d IPv6: %d", last_dns_ipv4, last_dns_ipv6);
+#endif
+
                while (dbus_message_iter_get_arg_type(&entry) == DBUS_TYPE_STRING) {
                        const char *val;
                        dbus_message_iter_get_basic(&entry, &val);
                        dbus_message_iter_next(&entry);
+#ifdef TIZEN_EXT
+                       /* First unpack the DNS Config Method */
+                       DBG("DNS Config Method: %s", val);
+                       if((g_strcmp0(val, "ipv4.manual") == 0)) {
+                               service->dns_config_method_ipv4 =
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL;
+
+                               if(last_dns_ipv4 != CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       if(ip_type == CONNMAN_IPCONFIG_TYPE_UNKNOWN)
+                                               ip_type = CONNMAN_IPCONFIG_TYPE_IPV4;
+                                       else
+                                               ip_type = CONNMAN_IPCONFIG_TYPE_ALL;
+                               }
+                               continue;
+                       } else if(g_strcmp0(val, "ipv4.dhcp") == 0) {
+                               service->dns_config_method_ipv4 =
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP;
+                               if(last_dns_ipv4 == CONNMAN_DNSCONFIG_METHOD_MANUAL)
+                                       ip_type = CONNMAN_IPCONFIG_TYPE_IPV4;
+
+                               continue;
+                       } else if(g_strcmp0(val, "ipv6.manual") == 0) {
+                               service->dns_config_method_ipv6 =
+                                       CONNMAN_DNSCONFIG_METHOD_MANUAL;
+                               if(last_dns_ipv6 != CONNMAN_DNSCONFIG_METHOD_MANUAL) {
+                                       if(ip_type == CONNMAN_IPCONFIG_TYPE_UNKNOWN)
+                                               ip_type = CONNMAN_IPCONFIG_TYPE_IPV6;
+                                       else
+                                               ip_type = CONNMAN_IPCONFIG_TYPE_ALL;
+                               }
+                               continue;
+                       } else if(g_strcmp0(val, "ipv6.dhcp") == 0) {
+                               service->dns_config_method_ipv6 =
+                                       CONNMAN_DNSCONFIG_METHOD_DHCP;
+                               if(last_dns_ipv6 == CONNMAN_DNSCONFIG_METHOD_MANUAL)
+                                       ip_type = CONNMAN_IPCONFIG_TYPE_IPV6;
 
+                               continue;
+                       }
+#endif
                        if (!val[0])
                                continue;
 
@@ -3639,7 +6077,21 @@ static DBusMessage *set_property(DBusConnection *conn,
                                g_string_append(str, val);
                }
 
+#if defined TIZEN_EXT
+               if (service->dns_config_method_ipv4 == CONNMAN_DNSCONFIG_METHOD_DHCP &&
+                       service->dns_config_method_ipv6 == CONNMAN_DNSCONFIG_METHOD_DHCP) {
+                                       DBG("Both IPv4 and IPv6 DNS Method DHCP");
+                                       ip_type = CONNMAN_IPCONFIG_TYPE_ALL;
+               }
+               if (gw && strlen(gw))
+                       __connman_service_nameserver_del_routes(service,
+                                               ip_type);
+
+               DBG("%s ip_type: %d nameserver remove all", name, ip_type);
+               nameserver_remove_all(service, ip_type);
+#else
                nameserver_remove_all(service, CONNMAN_IPCONFIG_TYPE_ALL);
+#endif
                g_strfreev(service->nameservers_config);
 
                if (str->len > 0) {
@@ -3662,7 +6114,12 @@ static DBusMessage *set_property(DBusConnection *conn,
                if (gw && strlen(gw))
                        __connman_service_nameserver_add_routes(service, gw);
 
+#if defined TIZEN_EXT
+               DBG("%s ip_type: %d nameserver add all", name, ip_type);
+               nameserver_add_all(service, ip_type);
+#else
                nameserver_add_all(service, CONNMAN_IPCONFIG_TYPE_ALL);
+#endif
                dns_configuration_changed(service);
 
                if (__connman_service_is_connected_state(service,
@@ -3717,9 +6174,7 @@ static DBusMessage *set_property(DBusConnection *conn,
 
                service_save(service);
                timeservers_configuration_changed(service);
-
-               if (service == connman_service_get_default())
-                       __connman_timeserver_sync(service);
+               __connman_timeserver_conf_update(service);
 
        } else if (g_str_equal(name, "Domains.Configuration")) {
                DBusMessageIter entry;
@@ -3860,6 +6315,28 @@ static DBusMessage *set_property(DBusConnection *conn,
                }
 
                service_save(service);
+#if defined TIZEN_EXT
+               /* When AP is connected using WPS without SSID then its password needs
+                * to be saved for autoconnection */
+       } else if (g_str_equal(name, "Passphrase")) {
+               char *passphrase;
+
+               if (type != DBUS_TYPE_STRING)
+                       return __connman_error_invalid_arguments(msg);
+
+               dbus_message_iter_get_basic(&value, &passphrase);
+
+               __connman_service_set_passphrase(service, passphrase);
+#endif
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       } else if (g_str_equal(name, "EapOverEthernet")) {
+               int err = connman_service_set_eapol_property(service, &value);
+               if (err < 0)
+                       return __connman_error_failed(msg, -err);
+
+               service->connect_reason = CONNMAN_SERVICE_CONNECT_REASON_USER;
+               service_save(service);
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
        } else
                return __connman_error_invalid_property(msg);
 
@@ -3879,8 +6356,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);
 
@@ -4031,6 +6510,9 @@ void __connman_service_set_active_session(bool enable, GSList *list)
                case CONNMAN_SERVICE_TYPE_GPS:
                case CONNMAN_SERVICE_TYPE_VPN:
                case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+               case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                        break;
                }
 
@@ -4063,6 +6545,9 @@ static void preferred_tech_add_by_type(gpointer data, gpointer user_data)
                tech_data->preferred_list =
                        g_list_append(tech_data->preferred_list, service);
 
+#if defined TIZEN_EXT
+               if (!simplified_log)
+#endif
                DBG("type %d service %p %s", tech_data->type, service,
                                service->name);
        }
@@ -4090,6 +6575,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;
                        }
                }
@@ -4113,6 +6609,7 @@ static void set_always_connecting_technologies()
                always_connect[always_connected_techs[i]] = 1;
 }
 
+#if !defined TIZEN_EXT
 static bool autoconnect_no_session_active(struct connman_service *service)
 {
        /*
@@ -4125,6 +6622,7 @@ static bool autoconnect_no_session_active(struct connman_service *service)
 
        return false;
 }
+#endif
 
 static bool autoconnect_already_connecting(struct connman_service *service,
                                           bool autoconnecting)
@@ -4151,27 +6649,72 @@ static bool auto_connect_service(GList *services,
        bool ignore[MAX_CONNMAN_SERVICE_TYPES] = { };
        bool autoconnecting = false;
        GList *list;
+#if defined TIZEN_EXT
+       GSList *wifi_ignore = NULL;
+#endif
 
        DBG("preferred %d sessions %d reason %s", preferred, active_count,
                reason2string(reason));
 
        ignore[CONNMAN_SERVICE_TYPE_VPN] = true;
 
+#if defined TIZEN_EXT_WIFI_MESH
+       /* Don't auto connect wifi if mesh interface is created */
+       if (connman_mesh_is_interface_created())
+               ignore[CONNMAN_SERVICE_TYPE_WIFI] = true;
+#endif
+
        for (list = services; list; list = list->next) {
                service = list->data;
 
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
+                       int index = connman_network_get_index(service->network);
+                       if (g_slist_find(wifi_ignore, GINT_TO_POINTER(index)) != NULL)
+                               continue;
+               } else
+#endif
                if (ignore[service->type]) {
                        DBG("service %p type %s ignore", service,
                                __connman_service_type2string(service->type));
                        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->state) == TRUE || is_connected(service->state) == TRUE)
+                               continue;
+#endif
+
+               if (service->connect_reason ==
+                               CONNMAN_SERVICE_CONNECT_REASON_NATIVE) {
+                       DBG("service %p uses native autonnect, skip", service);
+                       continue;
+               }
+
                if (service->pending ||
                                is_connecting(service->state) ||
                                is_connected(service->state)) {
+#if defined TIZEN_EXT
+                       if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
+                               int index = connman_network_get_index(service->network);
+                               wifi_ignore = g_slist_prepend(wifi_ignore, GINT_TO_POINTER(index));
+
+                               autoconnecting = true;
+                               continue;
+                       }
+#else
                        if (autoconnect_no_session_active(service))
                                        return true;
-
+#endif
                        ignore[service->type] = true;
                        autoconnecting = true;
 
@@ -4185,13 +6728,28 @@ static bool auto_connect_service(GList *services,
                        if (preferred)
                               continue;
 
+#if defined TIZEN_EXT
+                       DBG("Service is not favorite, autoconnecting %d",
+                                       autoconnecting);
+                       g_slist_free(wifi_ignore);
+#endif
                        return autoconnecting;
                }
 
+#if defined TIZEN_EXT
+               DBG("service %p identifier %s roaming %d ignore %d "
+                               "ipconfig_usable %d autoconnect %d state %d",
+                               service,
+                               service->identifier, service->roaming,
+                               service->ignore, is_ipconfig_usable(service),
+                               service->autoconnect, service->state);
+#endif
                if (is_ignore(service) || service->state !=
                                CONNMAN_SERVICE_STATE_IDLE)
                        continue;
-
+#if defined TIZEN_EXT
+               if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+#endif
                if (autoconnect_already_connecting(service, autoconnecting)) {
                        DBG("service %p type %s has no users", service,
                                __connman_service_type2string(service->type));
@@ -4201,15 +6759,27 @@ static bool auto_connect_service(GList *services,
                DBG("service %p %s %s", service, service->name,
                        (preferred) ? "preferred" : reason2string(reason));
 
+#if defined TIZEN_EXT
+               __connman_service_connect(service, reason);
+#else
                if (__connman_service_connect(service, reason) == 0)
                        service_indicate_state(service);
 
                if (autoconnect_no_session_active(service))
                        return true;
-
+#endif
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI) {
+                       int index = connman_network_get_index(service->network);
+                       wifi_ignore = g_slist_prepend(wifi_ignore, GINT_TO_POINTER(index));
+                       autoconnecting = true;
+               }
+#endif
                ignore[service->type] = true;
        }
-
+#if defined TIZEN_EXT
+       g_slist_free(wifi_ignore);
+#endif
        return autoconnecting;
 }
 
@@ -4236,6 +6806,21 @@ static gboolean run_auto_connect(gpointer data)
        return FALSE;
 }
 
+#if defined TIZEN_EXT
+bool __connman_service_get_auto_connect_mode(void)
+{
+       return auto_connect_mode;
+}
+
+void __connman_service_set_auto_connect_mode(bool enable)
+{
+       DBG("set auto_connect_mode = %d", enable);
+
+       if (auto_connect_mode != enable)
+               auto_connect_mode = enable;
+}
+#endif
+
 void __connman_service_auto_connect(enum connman_service_connect_reason reason)
 {
        DBG("");
@@ -4243,10 +6828,33 @@ void __connman_service_auto_connect(enum connman_service_connect_reason reason)
        if (autoconnect_id != 0)
                return;
 
+#if defined TIZEN_EXT
+       if (auto_connect_mode == FALSE) {
+               DBG("Currently, not auto connection mode");
+               return;
+       }
+#endif
+
        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_id = g_timeout_add(500, run_auto_connect,
+#else
        autoconnect_id = g_idle_add(run_auto_connect,
+#endif
                                                GUINT_TO_POINTER(reason));
 }
 
@@ -4481,21 +7089,47 @@ 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);
+
+       /*Reset the Disconnect Reason while issue connect request*/
+       service->disconnect_reason = 0;
+
+       /*Reset the association status code while issue connect request*/
+       service->assoc_status_code = 0;
+
+       /* Reset the disconnection_requested while issue connect request*/
+       connman_service_set_disconnection_requested(service, false);
+#endif
+
        if (service->pending)
                return __connman_error_in_progress(msg);
 
+#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 (!is_connecting(temp->state) && !is_connected(temp->state))
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_CELLULAR)
                        break;
+#endif
+               if (!is_connecting(temp->state) && !is_connected(temp->state))
+                       continue;
 
                if (service == temp)
                        continue;
@@ -4510,6 +7144,7 @@ static DBusMessage *connect_service(DBusConnection *conn,
        }
        if (err == -EINPROGRESS)
                return __connman_error_operation_timeout(msg);
+#endif
 
        service->ignore = false;
 
@@ -4532,6 +7167,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->state) == TRUE &&
+                               service == connman_service_get_default_connection())
+                       return __connman_error_failed(msg, EISCONN);
+       }
+#endif
+
        service->ignore = true;
 
        err = __connman_service_disconnect(service);
@@ -4541,6 +7190,36 @@ 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);
+       connman_network_set_string(service->network, "WiFi.AnonymousIdentity", NULL);
+}
+static void __connman_service_cleanup_network_dpp(struct connman_service *service)
+{
+       if (service == NULL)
+               return;
+
+       DBG("service %p ", service);
+
+       connman_network_set_string(service->network, "WiFi.Connector", NULL);
+       connman_network_set_string(service->network, "WiFi.CSignKey", NULL);
+       connman_network_set_string(service->network, "WiFi.NetAccessKey", NULL);
+}
+#endif
+
 bool __connman_service_remove(struct connman_service *service)
 {
        if (service->type == CONNMAN_SERVICE_TYPE_ETHERNET ||
@@ -4551,8 +7230,10 @@ bool __connman_service_remove(struct connman_service *service)
                        __connman_provider_is_immutable(service->provider))
                return false;
 
+#if !defined TIZEN_EXT
        if (!service->favorite && !is_idle(service->state))
                return false;
+#endif
 
        __connman_service_disconnect(service);
 
@@ -4583,13 +7264,65 @@ 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;
+
+       g_free(service->connector);
+       service->connector = NULL;
+
+       g_free(service->c_sign_key);
+       service->c_sign_key = NULL;
+
+       g_free(service->net_access_key);
+       service->net_access_key = NULL;
+
+       __connman_service_cleanup_network_dpp(service);
+#endif
+
        service->error = CONNMAN_SERVICE_ERROR_UNKNOWN;
 
        __connman_service_set_favorite(service, false);
 
        __connman_ipconfig_ipv6_reset_privacy(service->ipconfig_ipv6);
 
+#if defined TIZEN_EXT
+       /* Reset IP Method and DNS Method to DHCP */
+       __connman_ipconfig_set_method(service->ipconfig_ipv4,
+                       CONNMAN_IPCONFIG_METHOD_DHCP);
+       service->dns_config_method_ipv4 = CONNMAN_DNSCONFIG_METHOD_DHCP;
+       g_strfreev(service->nameservers_config);
+       service->nameservers_config = NULL;
+#endif
+
+#if defined TIZEN_EXT
+       __connman_storage_remove_service(service->identifier);
+#else
        service_save(service);
+#endif
 
        return true;
 }
@@ -4702,6 +7435,9 @@ static void service_append_added_foreach(gpointer data, gpointer user_data)
                append_struct(service, iter);
                g_hash_table_remove(services_notify->add, service->path);
        } else {
+#if defined TIZEN_EXT
+               if (!simplified_log)
+#endif
                DBG("changed %s", service->path);
 
                append_struct_service(iter, NULL, service);
@@ -4762,27 +7498,22 @@ static void service_schedule_changed(void)
        services_notify->id = g_timeout_add(100, service_send_changed, NULL);
 }
 
-static DBusMessage *move_service(DBusConnection *conn,
-                                       DBusMessage *msg, void *user_data,
-                                                               bool before)
+int __connman_service_move(struct connman_service *service,
+                               struct connman_service *target, bool before)
 {
-       struct connman_service *service = user_data;
-       struct connman_service *target;
-       const char *path;
        enum connman_ipconfig_method target4, target6;
        enum connman_ipconfig_method service4, service6;
 
        DBG("service %p", service);
 
-       dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
-                                                       DBUS_TYPE_INVALID);
+       if (!service)
+               return -EINVAL;
 
        if (!service->favorite)
-               return __connman_error_not_supported(msg);
+               return -EOPNOTSUPP;
 
-       target = find_service(path);
        if (!target || !target->favorite || target == service)
-               return __connman_error_invalid_service(msg);
+               return -EINVAL;
 
        if (target->type == CONNMAN_SERVICE_TYPE_VPN) {
                /*
@@ -4793,14 +7524,14 @@ static DBusMessage *move_service(DBusConnection *conn,
                        connman_info("Cannot move service. "
                                "No routes defined for provider %s",
                                __connman_provider_get_ident(target->provider));
-                       return __connman_error_invalid_service(msg);
+                       return -EINVAL;
                }
 
-               set_split_routing(target, true);
+               __connman_service_set_split_routing(target, true);
        } else
-               set_split_routing(target, false);
+               __connman_service_set_split_routing(target, false);
 
-       set_split_routing(service, false);
+       __connman_service_set_split_routing(service, false);
 
        target4 = __connman_ipconfig_get_method(target->ipconfig_ipv4);
        target6 = __connman_ipconfig_get_method(target->ipconfig_ipv6);
@@ -4823,7 +7554,7 @@ static DBusMessage *move_service(DBusConnection *conn,
                if (service6 != CONNMAN_IPCONFIG_METHOD_OFF) {
                        if (!check_suitable_state(target->state_ipv6,
                                                        service->state_ipv6))
-                               return __connman_error_invalid_service(msg);
+                               return -EINVAL;
                }
        }
 
@@ -4831,7 +7562,7 @@ static DBusMessage *move_service(DBusConnection *conn,
                if (service4 != CONNMAN_IPCONFIG_METHOD_OFF) {
                        if (!check_suitable_state(target->state_ipv4,
                                                        service->state_ipv4))
-                               return __connman_error_invalid_service(msg);
+                               return -EINVAL;
                }
        }
 
@@ -4839,7 +7570,7 @@ static DBusMessage *move_service(DBusConnection *conn,
                if (target6 != CONNMAN_IPCONFIG_METHOD_OFF) {
                        if (!check_suitable_state(target->state_ipv6,
                                                        service->state_ipv6))
-                               return __connman_error_invalid_service(msg);
+                               return -EINVAL;
                }
        }
 
@@ -4847,7 +7578,7 @@ static DBusMessage *move_service(DBusConnection *conn,
                if (target4 != CONNMAN_IPCONFIG_METHOD_OFF) {
                        if (!check_suitable_state(target->state_ipv4,
                                                        service->state_ipv4))
-                               return __connman_error_invalid_service(msg);
+                               return -EINVAL;
                }
        }
 
@@ -4866,9 +7597,42 @@ static DBusMessage *move_service(DBusConnection *conn,
        else
                switch_default_service(service, target);
 
-       __connman_connection_update_gateway();
+       __connman_connection_update_gateway();
+
+       service_schedule_changed();
+
+       return 0;
+}
+
+static DBusMessage *move_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *user_data,
+                                                               bool before)
+{
+       struct connman_service *service = user_data;
+       struct connman_service *target;
+       const char *path;
+       int err;
+
+       DBG("service %p", service);
+
+       dbus_message_get_args(msg, NULL, DBUS_TYPE_OBJECT_PATH, &path,
+                                                       DBUS_TYPE_INVALID);
+
+       target = find_service(path);
 
-       service_schedule_changed();
+       err = __connman_service_move(service, target, before);
+       switch (err) {
+       case 0:
+               break;
+       case -EINVAL:
+               return __connman_error_invalid_service(msg);
+       case -EOPNOTSUPP:
+               return __connman_error_not_supported(msg);
+       default:
+               connman_warn("unsupported error code %d in move_service()",
+                                                                       err);
+               break;
+       }
 
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
@@ -4895,8 +7659,45 @@ static DBusMessage *reset_counters(DBusConnection *conn,
        return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+static DBusMessage *is_eapol_enabled(DBusConnection *conn,
+                                       DBusMessage *msg, void *user_data)
+{
+       struct connman_service *service = user_data;
+       DBG("service: %p path: %s UseEapol: %d", service, service->path, service->use_eapol);
+
+       dbus_bool_t eapol_status = service->use_eapol;
+
+       DBusMessage *reply = dbus_message_new_method_return(msg);
+       if (!reply) {
+               DBG("Failed to initialize reply");
+               return NULL;
+       }
+
+       dbus_message_append_args(reply, DBUS_TYPE_BOOLEAN, &eapol_status, DBUS_TYPE_INVALID);
+       return reply;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
+#if defined TIZEN_EXT
+static DBusMessage *downgrade_service(DBusConnection *conn,
+                                       DBusMessage *msg, void *user_data)
+{
+       struct connman_service *service = user_data;
+
+       downgrade_state(service);
+       __connman_connection_update_gateway();
+       start_online_check(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+
+       return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+}
+#endif
+
 static void service_schedule_added(struct connman_service *service)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("service %p", service);
 
        g_hash_table_remove(services_notify->remove, service->path);
@@ -4923,6 +7724,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))
                return false;
@@ -4952,12 +7757,22 @@ static const GDBusMethodTable service_methods[] = {
                        GDBUS_ARGS({ "service", "o" }), NULL,
                        move_after) },
        { GDBUS_METHOD("ResetCounters", NULL, NULL, reset_counters) },
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       { GDBUS_METHOD("IsEapolEnabled", NULL, GDBUS_ARGS({ "eapol", "b" }), is_eapol_enabled) },
+#endif
+#if defined TIZEN_EXT
+       { GDBUS_METHOD("Downgrade", NULL, NULL, downgrade_service) },
+#endif
        { },
 };
 
 static const GDBusSignalTable service_signals[] = {
        { GDBUS_SIGNAL("PropertyChanged",
                        GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+#if defined TIZEN_EXT
+       { GDBUS_SIGNAL("StateChangedProperties",
+                       GDBUS_ARGS({ "properties", "a{sv}" })) },
+#endif
        { },
 };
 
@@ -5046,6 +7861,16 @@ static void service_free(gpointer user_data)
        g_free(service->phase2);
        g_free(service->config_file);
        g_free(service->config_entry);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       g_free(service->pac_file);
+       g_free(service->phase1);
+#endif
+
+#if defined TIZEN_EXT
+       g_free(service->connector);
+       g_free(service->c_sign_key);
+       g_free(service->net_access_key);
+#endif
 
        if (service->stats.timer)
                g_timer_destroy(service->stats.timer);
@@ -5073,6 +7898,9 @@ static void stats_init(struct connman_service *service)
 
 static void service_initialize(struct connman_service *service)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("service %p", service);
 
        service->refcount = 1;
@@ -5102,6 +7930,22 @@ static void service_initialize(struct connman_service *service)
 
        service->wps = false;
        service->wps_advertizing = false;
+#if defined TIZEN_EXT
+       memset(service->last_connected_bssid, 0, WIFI_BSSID_LEN_MAX);
+       service->is_internet_connection = false;
+       service->assoc_reject_count = 0;
+
+       service->disconnection_requested = false;
+       service->storage_reload = false;
+       /*
+        * Description: TIZEN implements system global connection management.
+        */
+       service->user_pdn_connection_refcount = 0;
+       __sync_synchronize();
+#endif
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       service->use_eapol = false;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 }
 
 /**
@@ -5190,20 +8034,269 @@ void connman_service_unref_debug(struct connman_service *service,
        g_hash_table_remove(service_hash, service->identifier);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static int calculate_score_last_user_selection(struct connman_service *service)
+{
+       int score = 0;
+       struct connman_device *device;
+       const char *last_user_selection_ident;
+       time_t last_user_selection_time;
+       unsigned int frequency;
+       time_t curr_time;
+       time_t ref_time;
+       struct tm* ref_timeinfo;
+
+       device = connman_network_get_device(service->network);
+       if (!device)
+               return 0;
+
+       last_user_selection_time = connman_device_get_last_user_selection_time(device);
+       last_user_selection_ident = connman_device_get_last_user_selection_ident(device);
+       frequency = connman_network_get_frequency(service->network);
+
+       if (ins_settings.last_user_selection) {
+               if (g_strcmp0(last_user_selection_ident, service->identifier) == 0 &&
+                       (((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 &&
+                       frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) &&
+                       service->strength >= ins_settings.signal_level3_24ghz) ||
+                       ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 &&
+                       frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) &&
+                       service->strength >= ins_settings.signal_level3_5ghz))) {
+
+                       /* Only events that occur within 8 hours are counted. */
+                       curr_time = time(NULL);
+                       ref_timeinfo = localtime(&curr_time);
+                       ref_timeinfo->tm_hour -= 8;
+                       ref_time = mktime(ref_timeinfo);
+
+                       if (last_user_selection_time > ref_time) {
+                               int time_diff = (curr_time - last_user_selection_time) / 60;
+                               int denominator = ins_settings.last_user_selection_time - time_diff;
+                               int numerator = ins_settings.last_user_selection_time /
+                                                                       ins_settings.last_user_selection_score;
+                               int last_user_score = denominator / numerator;
+
+                               score += (last_user_score > ins_settings.last_user_selection_score ?
+                                       ins_settings.last_user_selection_score : last_user_score);
+                       }
+               }
+       }
+
+       return score;
+}
+
+static int calculate_score_last_connected(struct connman_service *service)
+{
+       int score = 0;
+       struct connman_device *device;
+       const char *last_connected_ident;
+       unsigned int frequency;
+
+       device = connman_network_get_device(service->network);
+       if (!device)
+               return 0;
+
+       last_connected_ident = connman_device_get_last_connected_ident(device);
+       frequency = connman_network_get_frequency(service->network);
+
+       if (ins_settings.last_connected) {
+               if (g_strcmp0(last_connected_ident, service->identifier) == 0 &&
+                               (((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 &&
+                               frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) &&
+                               service->strength >= ins_settings.signal_level3_24ghz) ||
+                               ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 &&
+                               frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) &&
+                               service->strength >= ins_settings.signal_level3_5ghz))) {
+                       score += ins_settings.last_connected_score;
+               }
+       }
+
+       return score;
+}
+
+static int calculate_score_frequency(struct connman_service *service)
+{
+       int score = 0;
+       unsigned int frequency;
+
+       frequency = connman_network_get_frequency(service->network);
+
+       switch (ins_settings.preferred_freq) {
+       case CONNMAN_INS_PREFERRED_FREQ_24GHZ:
+               if ((frequency >= FREQ_RANGE_24GHZ_CHANNEL_1 &&
+                       frequency <= FREQ_RANGE_24GHZ_CHANNEL_14) &&
+                       (service->strength >= ins_settings.signal_level3_24ghz))
+                       score += ins_settings.preferred_freq_score;
+
+               break;
+       case CONNMAN_INS_PREFERRED_FREQ_5GHZ:
+               if ((frequency >= FREQ_RANGE_5GHZ_CHANNEL_32 &&
+                       frequency <= FREQ_RANGE_5GHZ_CHANNEL_165) &&
+                       (service->strength >= ins_settings.signal_level3_5ghz))
+                       score += ins_settings.preferred_freq_score;
+
+               break;
+       default:
+               break;
+       }
+
+       return score;
+}
+
+static int calculate_score_security_priority(struct connman_service *service)
+{
+       int score = 0;
+
+       if (ins_settings.security_priority_count)
+               score += ins_settings.security_priority[service->security];
+
+       return score;
+}
+
+static int calculate_score_internet_connection(struct connman_service *service)
+{
+       int score = 0;
+
+       if (ins_settings.internet) {
+               if (service->is_internet_connection)
+                       score += ins_settings.internet_score;
+       }
+
+       return score;
+}
+
+static int calculate_score_strength(struct connman_service *service)
+{
+       int score = 0;
+
+       if (ins_settings.signal)
+               score += (((service->strength > 60) ? 60 : service->strength) - 35);
+
+       return score;
+}
+
+static int calculate_score(struct connman_service *service)
+{
+       int score_last_user_selection;
+       int score_last_connected;
+       int score_frequency;
+       int score_security_priority;
+       int score_internet_connection;
+       int score_strength;
+       int score = 0;
+
+       if (service->type != CONNMAN_SERVICE_TYPE_WIFI) {
+               score += calculate_score_internet_connection(service);
+               service->ins_score = score;
+               return score;
+       }
+
+       score_last_user_selection = calculate_score_last_user_selection(service);
+       score_last_connected = calculate_score_last_connected(service);
+       score_frequency = calculate_score_frequency(service);
+       score_security_priority = calculate_score_security_priority(service);
+       score_internet_connection = calculate_score_internet_connection(service);
+       score_strength = calculate_score_strength(service);
+
+       score = score_last_user_selection + score_last_connected +
+               score_frequency + score_security_priority +
+               score_internet_connection + score_strength;
+
+       service->score_last_user_selection = score_last_user_selection;
+       service->score_last_connected = score_last_connected;
+       service->score_frequency = score_frequency;
+       service->score_security_priority = score_security_priority;
+       service->score_internet_connection = score_internet_connection;
+       service->score_strength = score_strength;
+
+       service->ins_score = score;
+       return score;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
+static gint service_compare(gconstpointer a, gconstpointer b);
+
+static gint service_compare_vpn(struct connman_service *a,
+                                               struct connman_service *b)
+{
+       struct connman_provider *provider;
+       struct connman_service *service;
+       struct connman_service *transport;
+       const char *ident;
+       bool reverse;
+
+       if (a->provider) {
+               provider = a->provider;
+               service = b;
+               reverse = false;
+       } else if (b->provider) {
+               provider = b->provider;
+               service = a;
+               reverse = true;
+       } else {
+               return 0;
+       }
+
+       ident = __connman_provider_get_transport_ident(provider);
+       transport = connman_service_lookup_from_identifier(ident);
+       if (!transport)
+               return 0;
+
+       if (reverse)
+               return service_compare(service, transport);
+
+       return service_compare(transport, service);
+}
+
 static gint service_compare(gconstpointer a, gconstpointer b)
 {
        struct connman_service *service_a = (void *) a;
        struct connman_service *service_b = (void *) b;
        enum connman_service_state state_a, state_b;
        bool a_connected, b_connected;
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+       int score_a;
+       int score_b;
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
        gint strength;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        state_a = service_a->state;
        state_b = service_b->state;
        a_connected = is_connected(state_a);
        b_connected = is_connected(state_b);
 
+#if defined TIZEN_EXT
+       if ((a_connected && b_connected) &&
+                       state_a == state_b &&
+                       service_a->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                       service_b->type == CONNMAN_SERVICE_TYPE_WIFI) {
+               const char *default_interface =
+                               connman_setting_get_string("DefaultWifiInterface");
+               const char *ifname_a = connman_device_get_string(
+                               connman_network_get_device(service_a->network), "Interface");
+               const char *ifname_b = connman_device_get_string(
+                               connman_network_get_device(service_b->network), "Interface");
+
+               if (g_strcmp0(default_interface, ifname_a) == 0)
+                       return -1;
+               else if (g_strcmp0(default_interface, ifname_b) == 0)
+                       return 1;
+       }
+#endif
+
        if (a_connected && b_connected) {
+               int rval;
+
+               /* Compare the VPN transport and the service */
+               if ((service_a->type == CONNMAN_SERVICE_TYPE_VPN ||
+                               service_b->type == CONNMAN_SERVICE_TYPE_VPN) &&
+                               service_b->type != service_a->type) {
+                       rval = service_compare_vpn(service_a, service_b);
+                       if (rval)
+                               return rval;
+               }
+
                if (service_a->order > service_b->order)
                        return -1;
 
@@ -5285,17 +8378,44 @@ static gint service_compare(gconstpointer a, gconstpointer b)
                        return 1;
        }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+       score_a = calculate_score(service_a);
+       score_b = calculate_score(service_b);
+       if (score_b != score_a)
+               return score_b - score_a;
+#else /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
        strength = (gint) service_b->strength - (gint) service_a->strength;
        if (strength)
                return strength;
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
 
        return g_strcmp0(service_a->name, service_b->name);
 }
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static void print_service_sort(gpointer data, gpointer user_data)
+{
+       struct connman_service *service = data;
+
+       if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+               return;
+
+       DBG("name[%-20s] total[%2d] last_usr[%2d] last_conn[%2d] "
+               "freq[%2d] sec[%2d] internet[%2d] strength[%2d]",
+               service->name, service->ins_score, service->score_last_user_selection,
+               service->score_last_connected, service->score_frequency,
+               service->score_security_priority, service->score_internet_connection,
+               service->score_strength);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
 static void service_list_sort(void)
 {
        if (service_list && service_list->next) {
                service_list = g_list_sort(service_list, service_compare);
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+               g_list_foreach(service_list, print_service_sort, NULL);
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
                service_schedule_changed();
        }
 }
@@ -5433,6 +8553,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->state) && 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
@@ -5445,6 +8612,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;
 
@@ -5559,6 +8730,28 @@ void __connman_service_set_string(struct connman_service *service,
                service->phase2 = g_strdup(value);
        } else if (g_str_equal(key, "Passphrase"))
                __connman_service_set_passphrase(service, value);
+#if defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET
+       else if (g_str_equal(key, "Phase1")) {
+               g_free(service->phase1);
+               service->phase1 = g_strdup(value);
+       } else if (g_str_equal(key, "PacFile")) {
+               g_free(service->pac_file);
+               service->pac_file = g_strdup(value);
+       }
+#endif
+#if defined TIZEN_EXT
+        else if (g_str_equal(key, "Connector")) {
+               g_free(service->connector);
+               service->connector = g_strdup(value);
+        }      else if (g_str_equal(key, "CSignKey")) {
+               g_free(service->c_sign_key);
+               service->c_sign_key = g_strdup(value);
+        }      else if (g_str_equal(key, "NetAccessKey")) {
+               g_free(service->net_access_key);
+               service->net_access_key = g_strdup(value);
+       } else
+               DBG("Unknown key: %s", key);
+#endif
 }
 
 void __connman_service_set_search_domains(struct connman_service *service,
@@ -5594,8 +8787,17 @@ 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 &&
+                               service->error != CONNMAN_SERVICE_ERROR_ASSOC_FAILED)
+                       set_error(service, CONNMAN_SERVICE_ERROR_UNKNOWN);
+#endif
                service_complete(service);
+               service_list_sort();
                __connman_connection_update_gateway();
        }
 }
@@ -5667,14 +8869,18 @@ static void request_input_cb(struct connman_service *service,
                goto done;
        }
 
-       if (service->hidden && name_len > 0 && name_len <= 32) {
-               device = connman_network_get_device(service->network);
-               security = connman_network_get_string(service->network,
-                                                       "WiFi.Security");
-               err = __connman_device_request_hidden_scan(device,
-                                               name, name_len,
-                                               identity, passphrase,
-                                               security, user_data);
+       if (service->hidden) {
+               if (name_len > 0 && name_len <= 32) {
+                       device = connman_network_get_device(service->network);
+                       security = connman_network_get_string(service->network,
+                                                               "WiFi.Security");
+                       err = __connman_device_request_hidden_scan(device,
+                                                               name, name_len,
+                                                               identity, passphrase,
+                                                               security, user_data);
+               } else {
+                       err = -EINVAL;
+               }
                if (err < 0)
                        __connman_service_return_error(service, -err,
                                                        user_data);
@@ -5779,6 +8985,139 @@ 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->state) == TRUE || is_connecting(service->state) == 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;
+       struct connman_network *network = __connman_service_get_network(service);
+
+       if (!network)
+               return;
+
+       if (default_connecting_device == NULL)
+               return;
+
+       default_device = connman_network_get_device(network);
+
+       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;
+}
+
+#if defined TIZEN_MAINTAIN_ONLINE
+static void __connman_service_connect_default(struct connman_service *current,
+                                                                 enum connman_service_state old_state)
+#else
+static void __connman_service_connect_default(struct connman_service *current)
+#endif
+{
+       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;
+#if defined TIZEN_MAINTAIN_ONLINE
+       } else if (current->state == CONNMAN_SERVICE_STATE_READY &&
+                          old_state == CONNMAN_SERVICE_STATE_ONLINE) {
+               DBG("Device is downgraded: online --> ready");
+#endif
+       } else if (is_connected(current->state) == TRUE || is_connecting(current->state) == 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->state) == TRUE ||
+                                       is_connecting(default_service->state) == 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;
@@ -5787,27 +9126,113 @@ 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->state))
                        break;
 
                if (service == allowed)
                        continue;
+#endif
 
                services = g_slist_prepend(services, service);
        }
 
-       for (list = services; list; list = list->next) {
-               service = list->data;
+       for (list = services; list; list = list->next) {
+               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->state) == FALSE)
+                       service->order = 5;
+               else
+#if defined TIZEN_MAINTAIN_ONLINE
+               {
+                       if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
+                               service->state == CONNMAN_SERVICE_STATE_ONLINE)
+                               service->order = 6;
+                       else if (service->type != CONNMAN_SERVICE_TYPE_WIFI)
+                               service->order = 6;
+                       else
+                               service->order = 5;
+               }
+#else
+                       service->order = 6;
+#endif
+       }
+}
+
+static void emit_wifi_roaming_failure(struct connman_service *service,
+                                       enum connman_service_state new_state)
+{
+       if (connman_setting_get_bool("WifiRoaming") &&
+                       connman_network_get_bool(service->network, "WiFi.Roaming")) {
+               const char *cur_bssid;
+               const char *dst_bssid;
+               const char *ifname;
+               struct connman_device *device;
+
+               device = connman_network_get_device(service->network);
+               if (device) {
+                       ifname = connman_device_get_string(device, "Interface");
+                       cur_bssid = connman_network_get_string(service->network,
+                                               "WiFi.RoamingCurBSSID");
+                       dst_bssid = connman_network_get_string(service->network,
+                                               "WiFi.RoamingDstBSSID");
+               }
 
-               DBG("disconnecting %p %s", service, service->path);
-               __connman_service_disconnect(service);
+               if (device && ifname && cur_bssid && dst_bssid) {
+                       switch(new_state) {
+                       case CONNMAN_SERVICE_STATE_UNKNOWN:
+                       case CONNMAN_SERVICE_STATE_ASSOCIATION:
+                       case CONNMAN_SERVICE_STATE_CONFIGURATION:
+                       case CONNMAN_SERVICE_STATE_READY:
+                       case CONNMAN_SERVICE_STATE_ONLINE:
+                               break;
+                       case CONNMAN_SERVICE_STATE_DISCONNECT:
+                       case CONNMAN_SERVICE_STATE_FAILURE:
+                       case CONNMAN_SERVICE_STATE_IDLE:
+                               __connman_technology_notify_roaming_state(ifname,
+                                               "failure", cur_bssid, dst_bssid);
+                               connman_network_set_bool(service->network,
+                                               "WiFi.Roaming", false);
+                               connman_network_set_string(service->network,
+                                               "WiFi.RoamingCurBSSID", NULL);
+                               connman_network_set_string(service->network,
+                                               "WiFi.RoamingDstBSSID", NULL);
+                               break;
+                       }
+               }
        }
-
-       g_slist_free(services);
 }
+#endif
 
 static const char *get_dbus_sender(struct connman_service *service)
 {
@@ -5856,6 +9281,14 @@ static int service_indicate_state(struct connman_service *service)
                searchdomain_remove_all(service);
 
        service->state = new_state;
+#if defined TIZEN_EXT
+       if (!is_connected(old_state) && is_connected(new_state))
+               connman_device_send_connected_signal(
+                               connman_network_get_device(service->network), true);
+       else if (is_connected(old_state) && !is_connected(new_state))
+               connman_device_send_connected_signal(
+                               connman_network_get_device(service->network), false);
+#endif
        state_changed(service);
 
        if (!is_connected(old_state) && is_connected(new_state))
@@ -5947,15 +9380,38 @@ static int service_indicate_state(struct connman_service *service)
                        __connman_ipconfig_disable_ipv6(
                                                service->ipconfig_ipv6);
 
+#if !defined TIZEN_MAINTAIN_ONLINE
                if (connman_setting_get_bool("SingleConnectedTechnology"))
                        single_connected_tech(service);
                else if (service->type != CONNMAN_SERVICE_TYPE_VPN)
                        vpn_auto_connect();
+#else
+               if (service->type != CONNMAN_SERVICE_TYPE_VPN)
+                       vpn_auto_connect();
+#endif
+
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+                       set_priority_connected_service();
+#endif
 
                break;
 
        case CONNMAN_SERVICE_STATE_ONLINE:
+#if defined TIZEN_MAINTAIN_ONLINE
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+                       set_priority_connected_service();
+#endif
+
+               if (connman_setting_get_bool("SingleConnectedTechnology"))
+                       single_connected_tech(service);
+#endif
 
+#if defined TIZEN_EXT
+               if (service->type == CONNMAN_SERVICE_TYPE_WIFI)
+                       connman_service_set_internet_connection(service, true);
+#endif
                break;
 
        case CONNMAN_SERVICE_STATE_DISCONNECT:
@@ -5969,8 +9425,22 @@ 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
                domain_changed(service);
                proxy_changed(service);
+#if defined TIZEN_EXT
+               }
+
+               emit_wifi_roaming_failure(service, new_state);
+#endif
 
                /*
                 * Previous services which are connected and which states
@@ -5983,12 +9453,20 @@ 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),
                                                report_error_cb,
                                                get_dbus_sender(service),
                                                NULL);
+#if !defined TIZEN_EXT
+                       goto notifier;
+#endif
                }
                service_complete(service);
                break;
@@ -5996,8 +9474,20 @@ static int service_indicate_state(struct connman_service *service)
 
        service_list_sort();
 
+#if defined TIZEN_EXT
+#if defined TIZEN_MAINTAIN_ONLINE
+       __connman_service_connect_default(service, old_state);
+#else
+       __connman_service_connect_default(service);
+#endif
+       emit_wifi_roaming_failure(service, new_state);
+#endif
+
        __connman_connection_update_gateway();
 
+#if !defined TIZEN_EXT
+notifier:
+#endif
        if ((old_state == CONNMAN_SERVICE_STATE_ONLINE &&
                        new_state != CONNMAN_SERVICE_STATE_READY) ||
                (old_state == CONNMAN_SERVICE_STATE_READY &&
@@ -6026,6 +9516,23 @@ int __connman_service_indicate_error(struct connman_service *service,
 
        set_error(service, error);
 
+/* 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);
+
+               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,
                                                CONNMAN_IPCONFIG_TYPE_IPV4);
@@ -6100,6 +9607,15 @@ enum connman_service_state __connman_service_ipconfig_get_state(
        return CONNMAN_SERVICE_STATE_UNKNOWN;
 }
 
+#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
@@ -6170,7 +9686,13 @@ static gboolean redo_wispr_ipv4(gpointer user_data)
 {
        struct connman_service *service = user_data;
 
+#if defined TIZEN_MAINTAIN_ONLINE
+       DBG("");
+
+       __connman_wispr_start(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#else
        redo_wispr(service, CONNMAN_IPCONFIG_TYPE_IPV4);
+#endif
 
        return FALSE;
 }
@@ -6184,11 +9706,13 @@ static gboolean redo_wispr_ipv6(gpointer user_data)
        return FALSE;
 }
 
-int __connman_service_online_check_failed(struct connman_service *service,
-                                       enum connman_ipconfig_type type)
+void __connman_service_online_check(struct connman_service *service,
+                                       enum connman_ipconfig_type type,
+                                       bool success)
 {
        GSourceFunc redo_func;
-       int *interval;
+       unsigned int *interval;
+       enum connman_service_state current_state;
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
                interval = &service->online_check_interval_ipv4;
@@ -6198,6 +9722,22 @@ int __connman_service_online_check_failed(struct connman_service *service,
                redo_func = redo_wispr_ipv6;
        }
 
+       if(!enable_online_to_ready_transition)
+               goto redo_func;
+
+       if (success) {
+               *interval = online_check_max_interval;
+       } else {
+               current_state = service->state;
+               downgrade_state(service);
+               if (current_state != service->state)
+                       *interval = online_check_initial_interval;
+               if (service != connman_service_get_default()) {
+                       return;
+               }
+       }
+
+redo_func:
        DBG("service %p type %s interval %d", service,
                __connman_ipconfig_type2string(type), *interval);
 
@@ -6205,12 +9745,10 @@ int __connman_service_online_check_failed(struct connman_service *service,
                                redo_func, connman_service_ref(service));
 
        /* Increment the interval for the next time, set a maximum timeout of
-        * ONLINE_CHECK_MAX_INTERVAL * ONLINE_CHECK_MAX_INTERVAL seconds.
+        * online_check_max_interval seconds * online_check_max_interval seconds.
         */
-       if (*interval < ONLINE_CHECK_MAX_INTERVAL)
+       if (*interval < online_check_max_interval)
                (*interval)++;
-
-       return EAGAIN;
 }
 
 int __connman_service_ipconfig_indicate_state(struct connman_service *service,
@@ -6254,6 +9792,10 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
                        connman_warn("ipconfig state %d ipconfig method %d",
                                new_state, method);
 
+#if defined TIZEN_EXT
+               if (old_state != CONNMAN_SERVICE_STATE_READY &&
+                               old_state != CONNMAN_SERVICE_STATE_ONLINE)
+#endif
                new_state = CONNMAN_SERVICE_STATE_IDLE;
                break;
 
@@ -6269,6 +9811,18 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
        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),
@@ -6282,6 +9836,30 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
        case CONNMAN_SERVICE_STATE_CONFIGURATION:
                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 (connman_setting_get_bool("EnableOnlineCheck"))
+                       if (type == CONNMAN_IPCONFIG_TYPE_IPV4) {
+#if !defined TIZEN_EXT
+                               check_proxy_setup(service);
+#endif
+#if defined TIZEN_MAINTAIN_ONLINE
+/*                             if (old_state == CONNMAN_SERVICE_STATE_ONLINE) */
+                                       check_proxy_setup(service);
+#endif
+                       } else {
+                               __connman_service_wispr_start(service, type);
+                       }
+               else
+                       connman_info("Online check disabled. "
+                               "Default service remains in READY state.");
                if (type == CONNMAN_IPCONFIG_TYPE_IPV4)
                        service_rp_filter(service, true);
                set_mdns(service, service->mdns_config);
@@ -6319,6 +9897,19 @@ int __connman_service_ipconfig_indicate_state(struct connman_service *service,
 
        __connman_timeserver_sync(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);
 }
 
@@ -6406,8 +9997,42 @@ static void prepare_8021x(struct connman_service *service)
        if (service->phase2)
                connman_network_set_string(service->network, "WiFi.Phase2",
                                                        service->phase2);
+
+#if defined TIZEN_EXT
+       if (service->keymgmt_type)
+               connman_network_set_string(service->network, "WiFi.KeymgmtType",
+                                                       service->keymgmt_type);
+
+       DBG("service->phase1 : %s", service->phase1);
+       if (service->phase1)
+               connman_network_set_string(service->network, "WiFi.Phase1",
+                                                       service->phase1);
+#endif
 }
 
+#if defined TIZEN_EXT
+static bool has_valid_configuration_object(struct connman_service *service)
+{
+       return service->connector && service->c_sign_key && service->net_access_key;
+}
+
+static void prepare_dpp(struct connman_service *service)
+{
+       DBG("prepare dpp");
+       if (service->connector)
+               connman_network_set_string(service->network, "WiFi.Connector",
+                                                               service->connector);
+
+       if (service->c_sign_key)
+               connman_network_set_string(service->network, "WiFi.CSignKey",
+                                                       service->c_sign_key);
+
+       if (service->net_access_key)
+               connman_network_set_string(service->network, "WiFi.NetAccessKey",
+                                                       service->net_access_key);
+}
+#endif
+
 static int service_connect(struct connman_service *service)
 {
        int err;
@@ -6415,11 +10040,41 @@ 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->state) && !is_connected(temp->state))
+                       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:
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                return -EINVAL;
        case CONNMAN_SERVICE_TYPE_ETHERNET:
        case CONNMAN_SERVICE_TYPE_GADGET:
@@ -6431,11 +10086,17 @@ static int service_connect(struct connman_service *service)
                switch (service->security) {
                case CONNMAN_SERVICE_SECURITY_UNKNOWN:
                case CONNMAN_SERVICE_SECURITY_NONE:
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_OWE:
+#endif
                        break;
                case CONNMAN_SERVICE_SECURITY_WEP:
                case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_SAE:
+#endif
                        if (service->error == CONNMAN_SERVICE_ERROR_INVALID_KEY)
                                return -ENOKEY;
 
@@ -6449,6 +10110,13 @@ static int service_connect(struct connman_service *service)
                        }
                        break;
 
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_DPP:
+                       if (has_valid_configuration_object(service) &&
+                                       !service->network)
+                               return -EINVAL;
+                       break;
+#endif
                case CONNMAN_SERVICE_SECURITY_8021X:
                        if (!service->eap) {
                                connman_warn("EAP type has not been found. "
@@ -6460,6 +10128,21 @@ static int service_connect(struct connman_service *service)
                                return -EINVAL;
                        }
 
+#if defined TIZEN_EXT
+                       /*
+                        * never request credentials if using EAP-TLS, EAP-SIM
+                        * or EAP-AKA (EAP-TLS, EAP-SIM and EAP-AKA networks
+                        * need to be fully provisioned)
+                        */
+                       DBG("service eap: %s", service->eap);
+                       if (g_str_equal(service->eap, "tls") ||
+                               g_str_equal(service->eap, "sim") ||
+                               g_str_equal(service->eap, "aka") ||
+                               g_str_equal(service->eap, "aka'") ||
+                               g_str_equal(service->eap, "pwd") ||
+                               g_str_equal(service->eap, "fast"))
+                               break;
+#else
                        /*
                         * never request credentials if using EAP-TLS
                         * (EAP-TLS networks need to be fully provisioned)
@@ -6467,6 +10150,7 @@ static int service_connect(struct connman_service *service)
                        if (g_str_equal(service->eap, "tls"))
                                break;
 
+#endif
                        /*
                         * Return -ENOKEY if either identity or passphrase is
                         * missing. Agent provided credentials can be used as
@@ -6494,6 +10178,13 @@ static int service_connect(struct connman_service *service)
                case CONNMAN_SERVICE_SECURITY_PSK:
                case CONNMAN_SERVICE_SECURITY_WPA:
                case CONNMAN_SERVICE_SECURITY_RSN:
+#if defined TIZEN_EXT
+               case CONNMAN_SERVICE_SECURITY_SAE:
+               case CONNMAN_SERVICE_SECURITY_OWE:
+                       break;
+               case CONNMAN_SERVICE_SECURITY_DPP:
+                       prepare_dpp(service);
+#endif
                        break;
                case CONNMAN_SERVICE_SECURITY_8021X:
                        prepare_8021x(service);
@@ -6551,6 +10242,9 @@ int __connman_service_connect(struct connman_service *service,
        case CONNMAN_SERVICE_TYPE_SYSTEM:
        case CONNMAN_SERVICE_TYPE_GPS:
        case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
                return -EINVAL;
 
        case CONNMAN_SERVICE_TYPE_ETHERNET:
@@ -6567,11 +10261,20 @@ int __connman_service_connect(struct connman_service *service,
 
        __connman_service_clear_error(service);
 
+       if (service->network && service->autoconnect &&
+                       __connman_network_native_autoconnect(service->network)) {
+               DBG("service %p switch connecting reason to native", service);
+               reason = CONNMAN_SERVICE_CONNECT_REASON_NATIVE;
+       }
+
        err = service_connect(service);
 
        DBG("service %p err %d", service, err);
 
        service->connect_reason = reason;
+#if defined TIZEN_EXT
+       connect_reason_changed(service);
+#endif
 
        if (err >= 0)
                return 0;
@@ -6653,6 +10356,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);
 
@@ -6661,6 +10372,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
 
        return err;
 }
@@ -6785,7 +10499,9 @@ static struct connman_service *service_get(const char *identifier)
        service = connman_service_create();
        if (!service)
                return NULL;
-
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("service %p", service);
 
        service->identifier = g_strdup(identifier);
@@ -6800,6 +10516,9 @@ static struct connman_service *service_get(const char *identifier)
 
 static int service_register(struct connman_service *service)
 {
+#if defined TIZEN_EXT
+       if (!simplified_log)
+#endif
        DBG("service %p", service);
 
        if (service->path)
@@ -6810,14 +10529,28 @@ static int service_register(struct connman_service *service)
 
        DBG("path %s", service->path);
 
+#if defined TIZEN_EXT
+       int ret;
+       service_load(service);
+       ret = service_ext_load(service);
+       if (ret == -ERANGE)
+               service_ext_save(service);
+       ret = __connman_config_provision_service(service);
+       if (ret < 0 && !simplified_log)
+               DBG("Failed to provision service");
+#else
        if (__connman_config_provision_service(service) < 0)
                service_load(service);
+#endif
 
        g_dbus_register_interface(connection, service->path,
                                        CONNMAN_SERVICE_INTERFACE,
                                        service_methods, service_signals,
                                                        NULL, service, NULL);
 
+       if (__connman_config_provision_service(service) < 0)
+               service_load(service);
+
        service_list_sort();
 
        __connman_connection_update_gateway();
@@ -6871,6 +10604,9 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig,
        struct connman_service *service = __connman_ipconfig_get_data(ipconfig);
        enum connman_ipconfig_method method = CONNMAN_IPCONFIG_METHOD_UNKNOWN;
        enum connman_ipconfig_type type = CONNMAN_IPCONFIG_TYPE_UNKNOWN;
+#if defined TIZEN_EXT
+       int err;
+#endif
 
        DBG("%s ip bound", ifname);
 
@@ -6882,9 +10618,18 @@ static void service_ip_bound(struct connman_ipconfig *ipconfig,
 
        if (type == CONNMAN_IPCONFIG_TYPE_IPV6 &&
                        method == CONNMAN_IPCONFIG_METHOD_AUTO)
+#if defined TIZEN_EXT
+       {
+               err = __connman_ipconfig_gateway_add(ipconfig, service);
+
+               if(err < 0)
+                       DBG("Failed to add gateway");
+       }
+#else
                __connman_service_ipconfig_indicate_state(service,
                                                CONNMAN_SERVICE_STATE_READY,
                                                CONNMAN_IPCONFIG_TYPE_IPV6);
+#endif
 
        settings_changed(service, ipconfig);
        address_updated(service, type);
@@ -7148,10 +10893,36 @@ 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, "sae"))
+               return CONNMAN_SERVICE_SECURITY_SAE;
+       else if (g_str_equal(security, "owe"))
+               return CONNMAN_SERVICE_SECURITY_OWE;
+       else if (g_str_equal(security, "dpp"))
+               return CONNMAN_SERVICE_SECURITY_DPP;
+       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;
 }
 
+#if defined TIZEN_EXT
+int check_passphrase_ext(struct connman_network *network,
+                                       const char *passphrase)
+{
+       const char *str;
+       enum connman_service_security security;
+
+       str = connman_network_get_string(network, "WiFi.Security");
+       security = convert_wifi_security(str);
+
+       return __connman_service_check_passphrase(security, passphrase);
+}
+#endif
+
 static void update_wps_values(struct connman_service *service,
                                struct connman_network *network)
 {
@@ -7222,6 +10993,75 @@ static void update_from_network(struct connman_service *service,
        service_list_sort();
 }
 
+static void trigger_autoconnect(struct connman_service *service)
+{
+       struct connman_device *device;
+       bool native;
+
+       if (!service->favorite)
+               return;
+
+       native = __connman_network_native_autoconnect(service->network);
+       if (native && service->autoconnect) {
+               DBG("trigger native autoconnect");
+               connman_network_set_autoconnect(service->network, true);
+               return;
+       }
+
+       device = connman_network_get_device(service->network);
+       if (device && connman_device_get_scanning(device, CONNMAN_SERVICE_TYPE_UNKNOWN))
+               return;
+
+       switch (service->type) {
+       case CONNMAN_SERVICE_TYPE_UNKNOWN:
+       case CONNMAN_SERVICE_TYPE_SYSTEM:
+       case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+                       case CONNMAN_SERVICE_TYPE_MESH:
+#endif
+               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:
+               do_auto_connect(service, 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);
+       if (service->eap != NULL)
+               connman_network_set_string(service->network, "WiFi.Connector",
+                               service->connector);
+       if (service->identity != NULL)
+               connman_network_set_string(service->network, "WiFi.CSignKey",
+                               service->c_sign_key);
+       if (service->phase2 != NULL)
+               connman_network_set_string(service->network, "WiFi.NetAccessKey",
+                               service->net_access_key);
+#endif
+}
+
 /**
  * __connman_service_create_from_network:
  * @network: network structure
@@ -7231,7 +11071,6 @@ static void update_from_network(struct connman_service *service,
 struct connman_service * __connman_service_create_from_network(struct connman_network *network)
 {
        struct connman_service *service;
-       struct connman_device *device;
        const char *ident, *group;
        char *name;
        unsigned int *auto_connect_types, *favorite_types;
@@ -7305,42 +11144,37 @@ struct connman_service * __connman_service_create_from_network(struct connman_ne
        service_register(service);
        service_schedule_added(service);
 
-       if (service->favorite) {
-               device = connman_network_get_device(service->network);
-               if (device && !connman_device_get_scanning(device,
-                                               CONNMAN_SERVICE_TYPE_UNKNOWN)) {
+       trigger_autoconnect(service);
 
-                       switch (service->type) {
-                       case CONNMAN_SERVICE_TYPE_UNKNOWN:
-                       case CONNMAN_SERVICE_TYPE_SYSTEM:
-                       case CONNMAN_SERVICE_TYPE_P2P:
-                               break;
+       __connman_notifier_service_add(service, service->name);
 
-                       case CONNMAN_SERVICE_TYPE_GADGET:
-                       case CONNMAN_SERVICE_TYPE_ETHERNET:
-                               if (service->autoconnect) {
-                                       __connman_service_connect(service,
-                                               CONNMAN_SERVICE_CONNECT_REASON_AUTO);
-                                       break;
-                               }
+       return service;
+}
 
-                               /* 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:
-                               do_auto_connect(service,
-                                       CONNMAN_SERVICE_CONNECT_REASON_AUTO);
-                               break;
-                       }
-               }
-       }
+#if defined TIZEN_EXT
+void __connman_service_notify_strength_changed(struct connman_network *network)
+{
+       struct connman_service *service;
+       uint8_t strength = 0;
 
-       __connman_notifier_service_add(service, service->name);
+       service = connman_service_lookup_from_network(network);
+       if (!service)
+               return;
 
-       return service;
+       if (!service->network)
+               return;
+
+       strength = connman_network_get_strength(service->network);
+       if (strength == service->strength)
+               return;
+
+       service->strength = strength;
+       if (!simplified_log)
+               DBG("Strength %d", strength);
+       strength_changed(service);
+       service_list_sort();
 }
+#endif
 
 void __connman_service_update_from_network(struct connman_network *network)
 {
@@ -7350,6 +11184,9 @@ void __connman_service_update_from_network(struct connman_network *network)
        bool roaming;
        const char *name;
        bool stats_enable;
+#if defined TIZEN_EXT
+       bool need_save = false;
+#endif
 
        service = connman_service_lookup_from_network(network);
        if (!service)
@@ -7358,6 +11195,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);
@@ -7399,6 +11243,16 @@ roaming:
        roaming_changed(service);
 
 sorting:
+#if defined TIZEN_EXT
+       need_save |= update_last_connected_bssid(service);
+       need_save |= update_assoc_reject(service);
+       if (need_save) {
+               g_get_current_time(&service->modified);
+               service_ext_save(service);
+               need_sort = true;
+       }
+#endif
+
        if (need_sort) {
                service_list_sort();
        }
@@ -7581,6 +11435,99 @@ static struct connman_agent_driver agent_driver = {
        .context_unref  = agent_context_unref,
 };
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+static void ins_setting_init(void)
+{
+       int i;
+       const char *string;
+       char **string_list;
+       unsigned int string_count;
+
+       ins_settings.last_user_selection = connman_setting_get_bool("INSLastUserSelection");
+       ins_settings.last_user_selection_time = connman_setting_get_uint("INSLastUserSelectionTime");
+       ins_settings.last_connected = connman_setting_get_bool("INSLastConnected");
+
+       string = connman_setting_get_string("INSPreferredFreq");
+       if (g_strcmp0(string, "5GHz") == 0)
+               ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_5GHZ;
+       else if (g_strcmp0(string, "2.4GHz") == 0)
+               ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_24GHZ;
+       else
+               ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_UNKNOWN;
+
+       ins_settings.security_priority_count = connman_setting_get_uint("INSSecurityPriorityCount");
+       ins_settings.security_priority_score = connman_setting_get_uint("INSSecurityPriorityScore");
+       string_count = ins_settings.security_priority_count;
+
+       memset(ins_settings.security_priority, 0, sizeof(ins_settings.security_priority));
+       string_list = connman_setting_get_string_list("INSSecurityPriority");
+       for (i = 0; string_list && string_list[i]; i++) {
+               unsigned int security_score = string_count * ins_settings.security_priority_score;
+
+               if (g_strcmp0(string_list[i], "WEP") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WEP] = security_score;
+               else if (g_strcmp0(string_list[i], "PSK") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_PSK] = security_score;
+               else if (g_strcmp0(string_list[i], "8021X") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_8021X] = security_score;
+               else if (g_strcmp0(string_list[i], "WPA") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WPA] = security_score;
+               else if (g_strcmp0(string_list[i], "RSN") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_RSN] = security_score;
+               else if (g_strcmp0(string_list[i], "SAE") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_SAE] = security_score;
+               else if (g_strcmp0(string_list[i], "OWE") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_OWE] = security_score;
+               else if (g_strcmp0(string_list[i], "DPP") == 0)
+                       ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_DPP] = security_score;
+
+               string_count--;
+       }
+
+       ins_settings.signal = connman_setting_get_bool("INSSignal");
+       ins_settings.internet = connman_setting_get_bool("INSInternet");
+
+       ins_settings.last_user_selection_score = connman_setting_get_uint("INSLastUserSelectionScore");
+       ins_settings.last_connected_score = connman_setting_get_uint("INSLastConnectedScore");
+       ins_settings.preferred_freq_score = connman_setting_get_uint("INSPreferredFreqScore");
+       ins_settings.internet_score = connman_setting_get_uint("INSInternetScore");
+
+       /*
+        * In ConnMan, signal strength is used after being converted
+        * to positive value(signal strength + 120).
+        * So the value for comparison should also be converted to the same.
+        */
+       ins_settings.signal_level3_5ghz = connman_setting_get_int("INSSignalLevel3_5GHz") + 120;
+       ins_settings.signal_level3_24ghz = connman_setting_get_int("INSSignalLevel3_24GHz") + 120;
+
+       DBG("last_user_selection [%s]", ins_settings.last_user_selection ? "true" : "false");
+       DBG("last_user_selection_time [%d]", ins_settings.last_user_selection_time);
+       DBG("last_user_selection_score [%d]", ins_settings.last_user_selection_score);
+
+       DBG("last_connected [%s]", ins_settings.last_connected ? "true" : "false");
+       DBG("last_connected_score [%d]", ins_settings.last_connected_score);
+
+       DBG("preferred_freq [%s]", ins_settings.preferred_freq ? "true" : "false");
+       DBG("preferred_freq_score [%d]", ins_settings.preferred_freq_score);
+
+       DBG("security_priority_count [%d]", ins_settings.security_priority_count);
+       for (i = 0; i < CONNMAN_SERVICE_SECURITY_MAX; i++) {
+               if (ins_settings.security_priority[i])
+                       DBG("security_priority %s [%d]", security2string(i),
+                                       ins_settings.security_priority[i]);
+       }
+       DBG("security_priority_score [%d]", ins_settings.security_priority_score);
+
+       DBG("signal [%s]", ins_settings.signal ? "true" : "false");
+
+       DBG("internet [%s]", ins_settings.internet ? "true" : "false");
+       DBG("internet_score [%d]", ins_settings.internet_score);
+
+       DBG("signal_level3_5ghz [%d]", ins_settings.signal_level3_5ghz);
+       DBG("signal_level3_24ghz [%d]", ins_settings.signal_level3_24ghz);
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
 int __connman_service_init(void)
 {
        int err;
@@ -7608,6 +11555,10 @@ int __connman_service_init(void)
 
        remove_unprovisioned_services();
 
+#if defined TIZEN_EXT && defined TIZEN_EXT_INS
+       ins_setting_init();
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_INS */
+
        return 0;
 }