X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fservice.c;h=f77c8a5841cf4e9ceeabd4e63338846092193bb6;hb=5269bd59e8100c6883b3f6e5609f57f8034e3140;hp=a720b7f94ea734cbec2e2b4e661fcdbabfb62f91;hpb=06df7a35bdebeafae866a50f08da60748c502adb;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/service.c b/src/service.c
index a720b7f..f77c8a5 100755
--- a/src/service.c
+++ b/src/service.c
@@ -210,9 +210,15 @@ struct connman_service {
 	int disconnect_reason;
 	int assoc_status_code;
 	/*
-	 * Only for EAP-FAST
+	 * 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.
 	 */
@@ -240,6 +246,12 @@ struct connman_service {
 #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);
@@ -635,6 +647,145 @@ 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)
 {
@@ -709,6 +860,9 @@ static int service_ext_load(struct connman_service *service)
 	int i;
 	int err = 0;
 
+#if defined TIZEN_EXT
+	if (!simplified_log)
+#endif
 	DBG("service %p", service);
 
 	if (!service->network)
@@ -882,7 +1036,12 @@ static int service_load(struct connman_service *service)
 #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);
@@ -1018,6 +1177,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;
 	}
 
@@ -1117,8 +1284,12 @@ static int service_load(struct connman_service *service)
 					service->identifier, "Hidden", NULL);
 
 #if defined TIZEN_EXT
-	if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
-			service->security == CONNMAN_SERVICE_SECURITY_8021X) {
+	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) {
@@ -1140,6 +1311,14 @@ static int service_load(struct connman_service *service)
 			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) {
@@ -1167,6 +1346,22 @@ static int service_load(struct connman_service *service)
 			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
@@ -1357,6 +1552,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;
 	}
 
@@ -1487,8 +1686,12 @@ static int service_save(struct connman_service *service)
 				"Config.ident", service->config_entry);
 
 #if defined TIZEN_EXT
-	if (service->type == CONNMAN_SERVICE_TYPE_WIFI &&
-			service->security == CONNMAN_SERVICE_SECURITY_8021X) {
+	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);
@@ -1509,6 +1712,14 @@ static int service_save(struct connman_service *service)
 		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,
@@ -1537,7 +1748,22 @@ static int service_save(struct connman_service *service)
 		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)
@@ -2743,6 +2969,31 @@ static void default_changed(void)
 	__connman_notifier_default_changed(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;
@@ -2756,14 +3007,17 @@ static void state_changed(struct connman_service *service)
 #if !defined TIZEN_EXT
 	if (!allow_property_changed(service))
 		return;
-
-#endif
-#if defined TIZEN_EXT
+#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
@@ -2998,6 +3252,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;
@@ -4109,12 +4414,18 @@ static void append_properties(DBusMessageIter *dict, dbus_bool_t limited,
 		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, &service->hidden_service);
+				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",
@@ -4611,6 +4922,30 @@ bool connman_service_get_internet_connection(struct connman_service *service)
 
 	return service->is_internet_connection;
 }
+
+DBusMessage *connman_service_get_defaut_info(DBusMessage *msg,
+							struct connman_service *service)
+{
+	DBusMessage *reply;
+	DBusMessageIter array, dict;
+
+	reply = dbus_message_new_method_return(msg);
+	if (!reply)
+		return NULL;
+
+	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,
@@ -5024,6 +5359,18 @@ 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;
+}
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
+
 static DBusMessage *get_properties(DBusConnection *conn,
 					DBusMessage *msg, void *user_data)
 {
@@ -5729,6 +6076,14 @@ static DBusMessage *set_property(DBusConnection *conn,
 
 		__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_save(service);
+#endif /* defined TIZEN_EXT && defined TIZEN_EXT_EAP_ON_ETHERNET */
 	} else
 		return __connman_error_invalid_property(msg);
 
@@ -5937,6 +6292,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);
 	}
@@ -6034,6 +6392,9 @@ 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));
@@ -6049,6 +6410,13 @@ static bool auto_connect_service(GList *services,
 	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));
@@ -6072,9 +6440,18 @@ static bool auto_connect_service(GList *services,
 		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;
 
@@ -6091,6 +6468,7 @@ static bool auto_connect_service(GList *services,
 #if defined TIZEN_EXT
 			DBG("Service is not favorite, autoconnecting %d",
 					autoconnecting);
+			g_slist_free(wifi_ignore);
 #endif
 			return autoconnecting;
 		}
@@ -6106,7 +6484,9 @@ static bool auto_connect_service(GList *services,
 		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));
@@ -6117,13 +6497,22 @@ static bool auto_connect_service(GList *services,
 			(preferred) ? "preferred" : reason2string(reason));
 
 		__connman_service_connect(service, reason);
-
+#if !defined TIZEN_EXT
 		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;
 }
 
@@ -6707,6 +7096,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);
@@ -6915,6 +7307,9 @@ static DBusMessage *downgrade_service(DBusConnection *conn,
 
 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);
@@ -6983,6 +7378,10 @@ static const GDBusMethodTable service_methods[] = {
 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
 	{ },
 };
 
@@ -7071,6 +7470,11 @@ 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);
@@ -7103,6 +7507,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;
@@ -7146,6 +7553,9 @@ static void service_initialize(struct connman_service *service)
 	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 */
 }
 
 /**
@@ -7426,6 +7836,25 @@ static gint service_compare(gconstpointer a, gconstpointer b)
 	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_option_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) {
 		if (service_a->order > service_b->order)
 			return -1;
@@ -7860,6 +8289,15 @@ 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);
@@ -8346,6 +8784,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))
@@ -9570,7 +10016,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);
@@ -9585,6 +10033,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)
@@ -9602,7 +10053,7 @@ static int service_register(struct connman_service *service)
 	if (ret == -ERANGE)
 		service_ext_save(service);
 	ret = __connman_config_provision_service(service);
-	if (ret < 0)
+	if (ret < 0 && !simplified_log)
 		DBG("Failed to provision service");
 #else
 	if (__connman_config_provision_service(service) < 0)
@@ -10218,7 +10669,8 @@ void __connman_service_notify_strength_changed(struct connman_network *network)
 		return;
 
 	service->strength = strength;
-	DBG("Strength %d", strength);
+	if (!simplified_log)
+		DBG("Strength %d", strength);
 	strength_changed(service);
 	service_list_sort();
 }
@@ -10496,9 +10948,9 @@ static void ins_setting_init(void)
 	ins_settings.last_connected = connman_setting_get_bool("INSLastConnected");
 
 	string = connman_option_get_string("INSPreferredFreq");
-	if (g_str_equal(string, "5GHz"))
+	if (g_strcmp0(string, "5GHz") == 0)
 		ins_settings.preferred_freq = CONNMAN_INS_PREFERRED_FREQ_5GHZ;
-	else if (g_str_equal(string, "2.4GHz"))
+	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;
@@ -10512,21 +10964,21 @@ static void ins_setting_init(void)
 	for (i = 0; string_list && string_list[i]; i++) {
 		unsigned int security_score = string_count * ins_settings.security_priority_score;
 
-		if (g_str_equal(string_list[i], "WEP"))
+		if (g_strcmp0(string_list[i], "WEP") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WEP] = security_score;
-		else if (g_str_equal(string_list[i], "PSK"))
+		else if (g_strcmp0(string_list[i], "PSK") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_PSK] = security_score;
-		else if (g_str_equal(string_list[i], "8021X"))
+		else if (g_strcmp0(string_list[i], "8021X") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_8021X] = security_score;
-		else if (g_str_equal(string_list[i], "WPA"))
+		else if (g_strcmp0(string_list[i], "WPA") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_WPA] = security_score;
-		else if (g_str_equal(string_list[i], "RSN"))
+		else if (g_strcmp0(string_list[i], "RSN") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_RSN] = security_score;
-		else if (g_str_equal(string_list[i], "SAE"))
+		else if (g_strcmp0(string_list[i], "SAE") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_SAE] = security_score;
-		else if (g_str_equal(string_list[i], "OWE"))
+		else if (g_strcmp0(string_list[i], "OWE") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_OWE] = security_score;
-		else if (g_str_equal(string_list[i], "DPP"))
+		else if (g_strcmp0(string_list[i], "DPP") == 0)
 			ins_settings.security_priority[CONNMAN_SERVICE_SECURITY_DPP] = security_score;
 
 		string_count--;