X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fdevice.c;h=377ef47ebaa34a7b7912630b0e1b3c8932f6896e;hb=e5cb500cd0a676f693b1503ac59eae08fe0c05c2;hp=3ec8f7154b790ce7902c5cb9f3b4e6b41d8f258b;hpb=30602f521a85820a9f6b7ac04876400e00c68b15;p=platform%2Fupstream%2Fconnman.git

diff --git a/src/device.c b/src/device.c
index 3ec8f71..377ef47 100755
--- a/src/device.c
+++ b/src/device.c
@@ -38,6 +38,10 @@ static GSList *device_list = NULL;
 static gchar **device_filter = NULL;
 static gchar **nodevice_filter = NULL;
 
+#if defined TIZEN_EXT
+static DBusConnection *connection;
+#endif
+
 enum connman_pending_type {
 	PENDING_NONE	= 0,
 	PENDING_ENABLE	= 1,
@@ -52,7 +56,7 @@ struct connman_device {
 							 * request
 							 */
 	bool powered;
-	bool scanning;
+	bool scanning[MAX_CONNMAN_SERVICE_TYPES];
 	char *name;
 	char *node;
 	char *address;
@@ -68,10 +72,39 @@ struct connman_device {
 	char *last_network;
 	struct connman_network *network;
 	GHashTable *networks;
+#if defined TIZEN_EXT
+	time_t last_user_selection_time;
+	char *last_user_selection_ident;
+	char *last_connected_ident;
+	GList *pending_reply_list; /* List of DBusMessage* for async reply to multiple
+				    * device power dbus calls, which are made before
+				    * connman_device_set_powered().
+				    */
+	int max_scan_ssids;
+	bool is_5_0_ghz_supported;
+	unsigned int mac_policy;
+	unsigned int preassoc_mac_policy;
+	unsigned int random_mac_lifetime;
+#endif
 };
 
+#if defined TIZEN_EXT
+static void __clear_pending_trigger(gpointer data, gpointer user_data)
+{
+	DBusMessage *msg = (DBusMessage *)data;
+	dbus_message_unref(msg);
+}
+#endif
+
 static void clear_pending_trigger(struct connman_device *device)
 {
+#if defined TIZEN_EXT
+	if (device->pending_reply_list) {
+		g_list_foreach(device->pending_reply_list, __clear_pending_trigger, NULL);
+		g_list_free(device->pending_reply_list);
+		device->pending_reply_list = NULL;
+	}
+#endif
 	if (device->pending_timeout > 0) {
 		g_source_remove(device->pending_timeout);
 		device->pending_timeout = 0;
@@ -152,12 +185,63 @@ enum connman_service_type __connman_device_get_service_type(
 	return CONNMAN_SERVICE_TYPE_UNKNOWN;
 }
 
+static bool device_has_service_type(struct connman_device *device,
+				enum connman_service_type service_type)
+{
+	enum connman_service_type device_service_type =
+		__connman_device_get_service_type(device);
+
+	/*
+	 * For devices whose device_service_type is unknown we should
+	 * allow to decide whether they support specific service_type
+	 * by themself.
+	 */
+	if (device_service_type == CONNMAN_SERVICE_TYPE_UNKNOWN)
+		return true;
+
+#if defined TIZEN_EXT_WIFI_MESH
+	if (device_service_type == CONNMAN_SERVICE_TYPE_MESH)
+		return service_type != CONNMAN_SERVICE_TYPE_MESH;
+#endif
+
+	if (device_service_type == CONNMAN_SERVICE_TYPE_WIFI) {
+		return service_type == CONNMAN_SERVICE_TYPE_WIFI ||
+			service_type == CONNMAN_SERVICE_TYPE_P2P;
+	}
+
+	return service_type == device_service_type;
+}
+
+#if defined TIZEN_EXT
+static void __device_pending_reset(gpointer data, gpointer user_data)
+{
+	DBusMessage *msg = (DBusMessage *)data;
+	DBusMessage *reply;
+
+	reply = __connman_error_failed(msg, ETIMEDOUT);
+	if (reply)
+		g_dbus_send_message(connection, reply);
+
+	dbus_message_unref(msg);
+}
+#endif
+
 static gboolean device_pending_reset(gpointer user_data)
 {
 	struct connman_device *device = user_data;
 
 	DBG("device %p", device);
 
+#if defined TIZEN_EXT
+	DBusMessage *reply;
+
+	/* Power request timed out, send ETIMEDOUT. */
+	if (device->pending_reply_list) {
+		g_list_foreach(device->pending_reply_list, __device_pending_reset, NULL);
+		g_list_free(device->pending_reply_list);
+		device->pending_reply_list = NULL;
+	}
+#endif
 	/* Power request timedout, reset power pending state. */
 	device->pending_timeout = 0;
 	device->powered_pending = PENDING_NONE;
@@ -179,7 +263,7 @@ int __connman_device_enable(struct connman_device *device)
 		return -EBUSY;
 
 	if (device->powered_pending == PENDING_ENABLE)
-		return -EALREADY;
+		return -EINPROGRESS;
 
 	if (device->powered_pending == PENDING_NONE && device->powered)
 		return -EALREADY;
@@ -205,15 +289,22 @@ int __connman_device_enable(struct connman_device *device)
 	if (err == -EALREADY) {
 		/* If device is already powered, but connman is not updated */
 		connman_device_set_powered(device, true);
+#ifdef TIZEN_EXT
+		if (device->type == CONNMAN_DEVICE_TYPE_WIFI) {
+			device->driver->set_mac_policy(device, device->mac_policy);
+			device->driver->set_preassoc_mac_policy(device, device->preassoc_mac_policy);
+			device->driver->set_random_mac_lifetime(device, device->random_mac_lifetime);
+		}
+#endif /* TIZEN_EXT */
 		goto done;
 	}
 	/*
 	 * if err == -EINPROGRESS, then the DBus call to the respective daemon
-	 * was successful. We set a 4 sec timeout so if the daemon never
+	 * was successful. We set a 10 sec timeout so if the daemon never
 	 * returns a reply, we would reset the pending request.
 	 */
 	if (err == -EINPROGRESS)
-		device->pending_timeout = g_timeout_add_seconds(4,
+		device->pending_timeout = g_timeout_add_seconds(10,
 					device_pending_reset, device);
 done:
 	return err;
@@ -230,7 +321,7 @@ int __connman_device_disable(struct connman_device *device)
 		return -EBUSY;
 
 	if (device->powered_pending == PENDING_DISABLE)
-		return -EALREADY;
+		return -EINPROGRESS;
 
 	if (device->powered_pending == PENDING_NONE && !device->powered)
 		return -EALREADY;
@@ -396,9 +487,65 @@ static void device_destruct(struct connman_device *device)
 
 	g_free(device->last_network);
 
+#if defined TIZEN_EXT
+	g_free(device->last_user_selection_ident);
+	g_free(device->last_connected_ident);
+#endif
+
 	g_free(device);
 }
 
+#if defined TIZEN_EXT
+static void device_send_changed(const char *ifname, enum connman_service_type type,
+								const char *key, bool state)
+{
+	DBusMessage *signal;
+	DBusMessageIter iter, dict;
+	dbus_bool_t value = state;
+	const char *tech_path = connman_techonology_get_path(type);
+
+	if (!tech_path || !ifname)
+		return;
+
+	DBG("%s %s %s", ifname, key, state ? "TRUE" : "FALSE");
+
+	signal = dbus_message_new_signal(tech_path,
+			CONNMAN_TECHNOLOGY_INTERFACE, "DeviceChanged");
+	if (!signal)
+		return;
+
+	dbus_message_iter_init_append(signal, &iter);
+
+	connman_dbus_dict_open(&iter, &dict);
+	connman_dbus_dict_append_basic(&dict, "Ifname",
+					DBUS_TYPE_STRING,
+					&ifname);
+	connman_dbus_dict_append_basic(&dict, key,
+					DBUS_TYPE_BOOLEAN,
+					&value);
+	connman_dbus_dict_close(&iter, &dict);
+
+	dbus_connection_send(connection, signal, NULL);
+	dbus_message_unref(signal);
+}
+
+static void __device_send_reply(gpointer data, gpointer user_data)
+{
+	DBusMessage *msg = (DBusMessage *)data;
+	g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+	dbus_message_unref(msg);
+}
+
+static void device_send_reply(struct connman_device *device)
+{
+	if (device->pending_reply_list) {
+		g_list_foreach(device->pending_reply_list, __device_send_reply, NULL);
+		g_list_free(device->pending_reply_list);
+		device->pending_reply_list = NULL;
+	}
+}
+#endif
+
 /**
  * connman_device_create:
  * @node: device node name (for example an address)
@@ -546,6 +693,11 @@ void connman_device_set_interface(struct connman_device *device,
 void connman_device_set_ident(struct connman_device *device,
 							const char *ident)
 {
+#ifdef TIZEN_EXT
+	if (device->ident && device->powered)
+		return;
+	else
+#endif
 	g_free(device->ident);
 	device->ident = g_strdup(ident);
 }
@@ -565,13 +717,19 @@ const char *connman_device_get_ident(struct connman_device *device)
 int connman_device_set_powered(struct connman_device *device,
 						bool powered)
 {
+	struct connman_device_scan_params params;
 	enum connman_service_type type;
+	int i;
 
 	DBG("device %p powered %d", device, powered);
 
 	if (device->powered == powered)
 		return -EALREADY;
 
+#if defined TIZEN_EXT
+	device_send_reply(device);
+#endif
+
 	clear_pending_trigger(device);
 
 	device->powered_pending = PENDING_NONE;
@@ -580,6 +738,11 @@ int connman_device_set_powered(struct connman_device *device,
 
 	type = __connman_device_get_service_type(device);
 
+#if defined TIZEN_EXT
+	device_send_changed(device->interface, type, "Powered", powered);
+	technology_save_device(device);
+#endif
+
 	if (!device->powered) {
 		__connman_technology_disabled(type);
 		return 0;
@@ -587,11 +750,15 @@ int connman_device_set_powered(struct connman_device *device,
 
 	__connman_technology_enabled(type);
 
-	device->scanning = false;
+	for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++)
+		device->scanning[i] = false;
 
-	if (device->driver && device->driver->scan)
-		device->driver->scan(CONNMAN_SERVICE_TYPE_UNKNOWN, device,
-					NULL, 0, NULL, NULL, NULL, NULL);
+	if (device->driver && device->driver->scan) {
+		memset(&params, 0, sizeof(params));
+		params.type = CONNMAN_SERVICE_TYPE_UNKNOWN;
+
+		device->driver->scan(device, &params);
+	}
 
 	return 0;
 }
@@ -602,16 +769,22 @@ bool connman_device_get_powered(struct connman_device *device)
 }
 
 static int device_scan(enum connman_service_type type,
-				struct connman_device *device)
+				struct connman_device *device,
+				bool force_full_scan)
 {
+	struct connman_device_scan_params params;
+
 	if (!device->driver || !device->driver->scan)
 		return -EOPNOTSUPP;
 
 	if (!device->powered)
 		return -ENOLINK;
 
-	return device->driver->scan(type, device, NULL, 0,
-					NULL, NULL, NULL, NULL);
+	memset(&params, 0, sizeof(params));
+	params.type = type;
+	params.force_full_scan = force_full_scan;
+
+	return device->driver->scan(device, &params);
 }
 
 int __connman_device_disconnect(struct connman_device *device)
@@ -657,6 +830,194 @@ int connman_device_reconnect_service(struct connman_device *device)
 	return 0;
 }
 
+#if defined TIZEN_EXT
+bool connman_device_set_last_user_selection_time(struct connman_device *device,
+						time_t time)
+{
+	if (device->last_user_selection_time != time) {
+		device->last_user_selection_time = time;
+		return true;
+	}
+
+	return false;
+}
+
+time_t connman_device_get_last_user_selection_time(struct connman_device *device)
+{
+	return device->last_user_selection_time;
+}
+
+bool connman_device_set_last_user_selection_ident(struct connman_device *device,
+						const char *ident)
+{
+	if (g_strcmp0(device->last_user_selection_ident, ident) != 0) {
+		g_free(device->last_user_selection_ident);
+		device->last_user_selection_ident = g_strdup(ident);
+
+		return true;
+	}
+
+	return false;
+}
+
+const char *connman_device_get_last_user_selection_ident(struct connman_device *device)
+{
+	return device->last_user_selection_ident;
+}
+
+bool connman_device_set_last_connected_ident(struct connman_device *device,
+						const char *ident)
+{
+	if (g_strcmp0(device->last_connected_ident, ident) != 0) {
+		g_free(device->last_connected_ident);
+		device->last_connected_ident = g_strdup(ident);
+
+		return true;
+	}
+
+	return false;
+}
+
+const char *connman_device_get_last_connected_ident(struct connman_device *device)
+{
+	return device->last_connected_ident;
+}
+
+void connman_device_save_last_user_selection(struct connman_device *device)
+{
+	GKeyFile *keyfile;
+	gchar *get_str;
+	gchar *selection_str;
+
+	keyfile = __connman_storage_load_ins();
+
+	selection_str = g_strdup_printf("%s:%ld",
+			device->last_user_selection_ident, device->last_user_selection_time);
+
+	if (!keyfile) {
+		keyfile = g_key_file_new();
+
+		g_key_file_set_string(keyfile, device->interface, "LastUserSelection", selection_str);
+		DBG("%s", selection_str);
+		__connman_storage_save_ins(keyfile);
+
+	} else {
+		get_str = g_key_file_get_string(keyfile, device->interface, "LastUserSelection", NULL);
+		if (!get_str || g_strcmp0(get_str, selection_str) != 0) {
+			g_key_file_set_string(keyfile, device->interface, "LastUserSelection", selection_str);
+			DBG("%s -> %s", get_str, selection_str);
+			__connman_storage_save_ins(keyfile);
+		}
+
+		g_free(get_str);
+	}
+
+	g_free(selection_str);
+	g_key_file_free(keyfile);
+}
+
+void connman_device_load_last_user_selection(struct connman_device *device)
+{
+	GKeyFile *keyfile;
+	gchar *get_str;
+	char **selection_str;
+
+	keyfile = __connman_storage_load_ins();
+	if (!keyfile)
+		return;
+
+	get_str = g_key_file_get_string(keyfile, device->interface, "LastUserSelection", NULL);
+	if (get_str) {
+		selection_str = g_strsplit(get_str, ":", 0);
+		if (selection_str) {
+			time_t ref_time;
+			struct tm* timeinfo;
+			time_t last_user_selection_time;
+
+			/* Only events that occur within 8 hours are counted. */
+			ref_time = time(NULL);
+			timeinfo = localtime(&ref_time);
+			timeinfo->tm_hour -= 8;
+			ref_time = mktime(timeinfo);
+
+			last_user_selection_time = strtol(selection_str[1], NULL, 10);
+
+			if (last_user_selection_time > ref_time) {
+				if (g_strcmp0(selection_str[0], device->last_user_selection_ident) != 0) {
+					g_free(device->last_user_selection_ident);
+					device->last_user_selection_ident = g_strdup(selection_str[0]);
+				}
+
+				device->last_user_selection_time = last_user_selection_time;
+
+				DBG("%s %ld", device->last_user_selection_ident, device->last_user_selection_time);
+			}
+
+			g_strfreev(selection_str);
+		}
+
+		g_free(get_str);
+	}
+
+	g_key_file_free(keyfile);
+}
+
+void connman_device_save_last_connected(struct connman_device *device)
+{
+	GKeyFile *keyfile;
+	gchar *get_str;
+
+	if (!device->last_connected_ident)
+		return;
+
+	keyfile = __connman_storage_load_ins();
+
+	if (!keyfile) {
+		keyfile = g_key_file_new();
+
+		g_key_file_set_string(keyfile, device->interface, "LastConnected", device->last_connected_ident);
+		DBG("%s", device->last_connected_ident);
+		__connman_storage_save_ins(keyfile);
+
+	} else {
+		get_str = g_key_file_get_string(keyfile, device->interface, "LastConnected", NULL);
+		if (!get_str || g_strcmp0(get_str, device->last_connected_ident) != 0) {
+			g_key_file_set_string(keyfile, device->interface, "LastConnected", device->last_connected_ident);
+			DBG("%s -> %s", get_str, device->last_connected_ident);
+			__connman_storage_save_ins(keyfile);
+		}
+
+		g_free(get_str);
+	}
+
+	g_key_file_free(keyfile);
+}
+
+void connman_device_load_last_connected(struct connman_device *device)
+{
+	GKeyFile *keyfile;
+	gchar *get_str;
+
+	keyfile = __connman_storage_load_ins();
+	if (!keyfile)
+		return;
+
+	get_str = g_key_file_get_string(keyfile, device->interface, "LastConnected", NULL);
+	if (get_str) {
+		if (g_strcmp0(get_str, device->last_connected_ident) != 0) {
+			g_free(device->last_connected_ident);
+			device->last_connected_ident = g_strdup(get_str);
+		}
+
+		DBG("%s", device->last_connected_ident);
+
+		g_free(get_str);
+	}
+
+	g_key_file_free(keyfile);
+}
+#endif
+
 static void mark_network_available(gpointer key, gpointer value,
 							gpointer user_data)
 {
@@ -682,7 +1043,8 @@ static gboolean remove_unavailable_network(gpointer key, gpointer value,
 {
 	struct connman_network *network = value;
 
-	if (connman_network_get_connected(network))
+	if (connman_network_get_connected(network) ||
+			connman_network_get_connecting(network))
 		return FALSE;
 
 	if (connman_network_get_available(network))
@@ -697,9 +1059,19 @@ void __connman_device_cleanup_networks(struct connman_device *device)
 					remove_unavailable_network, NULL);
 }
 
-bool connman_device_get_scanning(struct connman_device *device)
+bool connman_device_get_scanning(struct connman_device *device,
+				enum connman_service_type type)
 {
-	return device->scanning;
+	int i;
+
+	if (type != CONNMAN_SERVICE_TYPE_UNKNOWN)
+		return device->scanning[type];
+
+	for (i = 0; i < MAX_CONNMAN_SERVICE_TYPES; i++)
+		if (device->scanning[i])
+			return true;
+
+	return false;
 }
 
 void connman_device_reset_scanning(struct connman_device *device)
@@ -723,10 +1095,13 @@ int connman_device_set_scanning(struct connman_device *device,
 	if (!device->driver || !device->driver->scan)
 		return -EINVAL;
 
-	if (device->scanning == scanning)
+	if (type == CONNMAN_SERVICE_TYPE_UNKNOWN)
+		return -EINVAL;
+
+	if (device->scanning[type] == scanning)
 		return -EALREADY;
 
-	device->scanning = scanning;
+	device->scanning[type] = scanning;
 
 	if (scanning) {
 		__connman_technology_scan_started(device);
@@ -743,6 +1118,11 @@ int connman_device_set_scanning(struct connman_device *device,
 
 	__connman_service_auto_connect(CONNMAN_SERVICE_CONNECT_REASON_AUTO);
 
+#if defined TIZEN_EXT_WIFI_MESH
+	if (type == CONNMAN_SERVICE_TYPE_MESH)
+		__connman_mesh_auto_connect();
+#endif
+
 	return 0;
 }
 
@@ -760,6 +1140,11 @@ int connman_device_set_string(struct connman_device *device,
 	DBG("device %p key %s value %s", device, key, value);
 
 	if (g_str_equal(key, "Address")) {
+#ifdef TIZEN_EXT
+		if (device->address && device->powered)
+			return 0;
+		else
+#endif
 		g_free(device->address);
 		device->address = g_strdup(value);
 	} else if (g_str_equal(key, "Name")) {
@@ -788,6 +1173,9 @@ int connman_device_set_string(struct connman_device *device,
 const char *connman_device_get_string(struct connman_device *device,
 							const char *key)
 {
+#if defined TIZEN_EXT
+	if (!simplified_log)
+#endif
 	DBG("device %p key %s", device, key);
 
 	if (g_str_equal(key, "Address"))
@@ -815,7 +1203,9 @@ int connman_device_add_network(struct connman_device *device,
 					struct connman_network *network)
 {
 	const char *identifier = connman_network_get_identifier(network);
-
+#if defined TIZEN_EXT
+	if (!simplified_log)
+#endif
 	DBG("device %p network %p", device, network);
 
 	if (!identifier)
@@ -841,11 +1231,62 @@ int connman_device_add_network(struct connman_device *device,
 struct connman_network *connman_device_get_network(struct connman_device *device,
 							const char *identifier)
 {
+#if defined TIZEN_EXT
+	if (!simplified_log)
+#endif
 	DBG("device %p identifier %s", device, identifier);
 
 	return g_hash_table_lookup(device->networks, identifier);
 }
 
+#if defined TIZEN_EXT
+struct connman_network *connman_device_get_default_network(
+							struct connman_device *device)
+{
+	return device->network;
+}
+
+void connman_device_set_pending_reply(struct connman_device *device,
+							DBusMessage *msg)
+{
+	device->pending_reply_list = g_list_prepend(device->pending_reply_list, dbus_message_ref(msg));
+}
+
+void connman_device_send_connected_signal(struct connman_device *device,
+							bool connected)
+{
+	enum connman_service_type type;
+
+	if (!device)
+		return;
+
+	type = __connman_device_get_service_type(device);
+	device_send_changed(device->interface, type, "Connected", connected);
+}
+
+void connman_device_set_max_scan_ssids(struct connman_device *device,
+							int max_scan_ssids)
+{
+	device->max_scan_ssids = max_scan_ssids;
+}
+
+int connman_device_get_max_scan_ssids(struct connman_device *device)
+{
+	return device->max_scan_ssids;
+}
+
+void connman_device_set_wifi_5ghz_supported(struct connman_device *device,
+							bool is_5_0_ghz_supported)
+{
+	device->is_5_0_ghz_supported = is_5_0_ghz_supported;
+}
+
+bool connman_device_get_wifi_5ghz_supported(struct connman_device *device)
+{
+	return device->is_5_0_ghz_supported;
+}
+#endif
+
 /**
  * connman_device_remove_network:
  * @device: device structure
@@ -1058,7 +1499,7 @@ static int device_specific_scan(enum connman_service_type type,
 }
 
 int __connman_device_request_specific_scan(enum connman_service_type type,
-				int scan_type, GSList *specific_scan_list)
+				const char *ifname, int scan_type, GSList *specific_scan_list)
 {
 	bool success = false;
 	int last_err = -ENOSYS;
@@ -1077,6 +1518,9 @@ int __connman_device_request_specific_scan(enum connman_service_type type,
 		return -EOPNOTSUPP;
 	case CONNMAN_SERVICE_TYPE_WIFI:
 	case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+	case CONNMAN_SERVICE_TYPE_MESH:
+#endif
 		break;
 	}
 
@@ -1093,6 +1537,9 @@ int __connman_device_request_specific_scan(enum connman_service_type type,
 				continue;
 		}
 
+		if (ifname && g_strcmp0(device->interface, ifname) != 0)
+			continue;
+
 		err = device_specific_scan(type, device, scan_type, specific_scan_list);
 		if (err == 0 || err == -EINPROGRESS) {
 			success = true;
@@ -1107,9 +1554,9 @@ int __connman_device_request_specific_scan(enum connman_service_type type,
 
 	return last_err;
 }
-#endif
 
-int __connman_device_request_scan(enum connman_service_type type)
+int connman_device_request_device_scan(enum connman_service_type type,
+				const char * ifname, bool force_full_scan)
 {
 	bool success = false;
 	int last_err = -ENOSYS;
@@ -1128,23 +1575,166 @@ int __connman_device_request_scan(enum connman_service_type type)
 		return -EOPNOTSUPP;
 	case CONNMAN_SERVICE_TYPE_WIFI:
 	case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+	case CONNMAN_SERVICE_TYPE_MESH:
+#endif
 		break;
 	}
 
 	for (list = device_list; list; list = list->next) {
 		struct connman_device *device = list->data;
+
+		if (!device_has_service_type(device, type))
+			continue;
+
+		if (g_strcmp0(device->interface, ifname) != 0)
+			continue;
+
+		err = device_scan(type, device, force_full_scan);
+
+		if (err == 0 || err == -EINPROGRESS) {
+			success = true;
+		} else {
+			last_err = err;
+			DBG("device %p err %d", device, err);
+		}
+		break;
+	}
+
+	if (success)
+		return 0;
+
+	return last_err;
+}
+
+#if defined TIZEN_EXT_WIFI_MESH
+static int device_abort_scan(enum connman_service_type type,
+				struct connman_device *device)
+{
+	if (!device->driver || !device->driver->scan)
+		return -EOPNOTSUPP;
+
+	if (!device->powered)
+		return -ENOLINK;
+
+	return device->driver->abort_scan(type, device);
+}
+
+int __connman_device_abort_scan(enum connman_service_type type)
+{
+	GSList *list;
+	int err = -EINVAL;
+
+	if (type != CONNMAN_SERVICE_TYPE_MESH)
+		return -EINVAL;
+
+	for (list = device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
 		enum connman_service_type service_type =
 			__connman_device_get_service_type(device);
 
 		if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
-			if (type == CONNMAN_SERVICE_TYPE_P2P) {
+			if (type == CONNMAN_SERVICE_TYPE_MESH)
 				if (service_type != CONNMAN_SERVICE_TYPE_WIFI)
 					continue;
-			} else if (service_type != type)
+
+			if (!device->scanning) {
+				err = -EEXIST;
 				continue;
+			}
+
+			err = device_abort_scan(type, device);
+		}
+	}
+	return err;
+}
+
+static int device_mesh_specific_scan(enum connman_service_type type,
+				struct connman_device *device, const char *name,
+				unsigned int freq)
+{
+	if (!device->driver || !device->driver->mesh_specific_scan)
+		return -EOPNOTSUPP;
+
+	if (!device->powered)
+		return -ENOLINK;
+
+	return device->driver->mesh_specific_scan(type, device, name, freq, NULL);
+}
+
+int __connman_device_request_mesh_specific_scan(enum connman_service_type type,
+						const char *name,
+						unsigned int freq)
+{
+	bool success = false;
+	int last_err = -ENOSYS;
+	GSList *list;
+	int err;
+
+	if (type != CONNMAN_SERVICE_TYPE_MESH)
+		return -EINVAL;
+
+	for (list = device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
+		enum connman_service_type service_type =
+			__connman_device_get_service_type(device);
+
+		if (service_type != CONNMAN_SERVICE_TYPE_UNKNOWN) {
+			if (type == CONNMAN_SERVICE_TYPE_MESH)
+				if (service_type != CONNMAN_SERVICE_TYPE_WIFI)
+					continue;
+		}
+
+		err = device_mesh_specific_scan(type, device, name, freq);
+		if (err == 0 || err == -EALREADY || err == -EINPROGRESS) {
+			success = true;
+		} else {
+			last_err = err;
+			DBG("device %p err %d", device, err);
 		}
+	}
+
+	if (success)
+		return 0;
+
+	return last_err;
+}
+#endif /* TIZEN_EXT_WIFI_MESH */
+#endif
+
+static int connman_device_request_scan(enum connman_service_type type,
+					bool force_full_scan)
+{
+	bool success = false;
+	int last_err = -ENOSYS;
+	GSList *list;
+	int err;
+
+	switch (type) {
+	case CONNMAN_SERVICE_TYPE_UNKNOWN:
+	case CONNMAN_SERVICE_TYPE_SYSTEM:
+	case CONNMAN_SERVICE_TYPE_ETHERNET:
+	case CONNMAN_SERVICE_TYPE_BLUETOOTH:
+	case CONNMAN_SERVICE_TYPE_CELLULAR:
+	case CONNMAN_SERVICE_TYPE_GPS:
+	case CONNMAN_SERVICE_TYPE_VPN:
+	case CONNMAN_SERVICE_TYPE_GADGET:
+		return -EOPNOTSUPP;
+	case CONNMAN_SERVICE_TYPE_WIFI:
+	case CONNMAN_SERVICE_TYPE_P2P:
+#if defined TIZEN_EXT_WIFI_MESH
+	case CONNMAN_SERVICE_TYPE_MESH:
+#endif
+		break;
+	}
+
+	for (list = device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
+
+		if (!device_has_service_type(device, type))
+			continue;
 
-		err = device_scan(type, device);
+		err = device_scan(type, device, force_full_scan);
 #if defined TIZEN_EXT
 		/* When Scan is already in progress then return Error so that
 		 * wifi-manager can block the scan-done signal to be sent to
@@ -1167,21 +1757,135 @@ int __connman_device_request_scan(enum connman_service_type type)
 	return last_err;
 }
 
+int __connman_device_request_scan(enum connman_service_type type)
+{
+	return connman_device_request_scan(type, false);
+}
+
+int __connman_device_request_scan_full(enum connman_service_type type)
+{
+	return connman_device_request_scan(type, true);
+}
+
 int __connman_device_request_hidden_scan(struct connman_device *device,
 				const char *ssid, unsigned int ssid_len,
 				const char *identity, const char *passphrase,
 				const char *security, void *user_data)
 {
+	struct connman_device_scan_params params;
+
 	DBG("device %p", device);
 
 	if (!device || !device->driver ||
 			!device->driver->scan)
 		return -EINVAL;
 
-	return device->driver->scan(CONNMAN_SERVICE_TYPE_UNKNOWN,
-					device, ssid, ssid_len, identity,
-					passphrase, security, user_data);
+	params.type = CONNMAN_SERVICE_TYPE_UNKNOWN;
+	params.ssid = ssid;
+	params.ssid_len = ssid_len;
+	params.identity = identity;
+	params.passphrase = passphrase;
+	params.security = security;
+	params.user_data = user_data;
+
+	return device->driver->scan(device, &params);
+}
+
+void __connman_device_stop_scan(enum connman_service_type type)
+{
+	GSList *list;
+
+	for (list = device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
+
+		if (!device_has_service_type(device, type))
+			continue;
+
+		if (device->driver && device->driver->stop_scan)
+			device->driver->stop_scan(type, device);
+	}
+}
+
+#if defined TIZEN_EXT
+#define WIFI_MAC "/opt/etc/.mac.info"
+#define MAC_ADDR_LEN 18
+
+char *_get_wifi_addr(void)
+{
+	FILE *fp = NULL;
+	char* rv = 0;
+	char wifi_mac[MAC_ADDR_LEN + 1];
+	char *str;
+
+	fp = fopen(WIFI_MAC, "r");
+	if (!fp){
+		connman_error("[%s] not present", WIFI_MAC);
+		return NULL;
+	}
+
+	rv = fgets(wifi_mac, MAC_ADDR_LEN, fp);
+	if (!rv) {
+		connman_error("Failed to get wifi mac address");
+		fclose(fp);
+		return NULL;
+	}
+
+	str = g_try_malloc0(MAC_ADDR_LEN);
+	if (!str) {
+		connman_error("memory allocation failed");
+		fclose(fp);
+		return NULL;
+	}
+
+	snprintf(str, MAC_ADDR_LEN, "%c%c:%c%c:%c%c:%c%c:%c%c:%c%c",
+			g_ascii_tolower(wifi_mac[0]), g_ascii_tolower(wifi_mac[1]),
+			g_ascii_tolower(wifi_mac[3]), g_ascii_tolower(wifi_mac[4]),
+			g_ascii_tolower(wifi_mac[6]), g_ascii_tolower(wifi_mac[7]),
+			g_ascii_tolower(wifi_mac[9]), g_ascii_tolower(wifi_mac[10]),
+			g_ascii_tolower(wifi_mac[12]), g_ascii_tolower(wifi_mac[13]),
+			g_ascii_tolower(wifi_mac[15]), g_ascii_tolower(wifi_mac[16]));
+	fclose(fp);
+	return str;
+}
+
+char *_get_wifi_ident(void)
+{
+	FILE *fp = NULL;
+	char* rv = 0;
+	char wifi_mac[MAC_ADDR_LEN + 1];
+	char *str;
+
+	fp = fopen(WIFI_MAC, "r");
+	if (!fp){
+		connman_error("[%s] not present", WIFI_MAC);
+		return NULL;
+	}
+
+	rv = fgets(wifi_mac, MAC_ADDR_LEN, fp);
+	if (!rv) {
+		connman_error("Failed to get wifi mac address");
+		fclose(fp);
+		return NULL;
+	}
+
+	str = g_try_malloc0(MAC_ADDR_LEN);
+	if (!str) {
+		connman_error("memory allocation failed");
+		fclose(fp);
+		return NULL;
+	}
+
+	snprintf(str, MAC_ADDR_LEN, "%c%c%c%c%c%c%c%c%c%c%c%c",
+			g_ascii_tolower(wifi_mac[0]), g_ascii_tolower(wifi_mac[1]),
+			g_ascii_tolower(wifi_mac[3]), g_ascii_tolower(wifi_mac[4]),
+			g_ascii_tolower(wifi_mac[6]), g_ascii_tolower(wifi_mac[7]),
+			g_ascii_tolower(wifi_mac[9]), g_ascii_tolower(wifi_mac[10]),
+			g_ascii_tolower(wifi_mac[12]), g_ascii_tolower(wifi_mac[13]),
+			g_ascii_tolower(wifi_mac[15]), g_ascii_tolower(wifi_mac[16]));
+	fclose(fp);
+	return str;
 }
+#endif
 
 #if defined TIZEN_EXT
 char *index2ident(int index, const char *prefix)
@@ -1346,6 +2050,10 @@ struct connman_device *connman_device_create_from_index(int index)
 
 	connman_device_set_index(device, index);
 	connman_device_set_interface(device, devname);
+#if defined TIZEN_EXT
+	connman_device_load_last_connected(device);
+	connman_device_load_last_user_selection(device);
+#endif
 
 	if (ident) {
 		connman_device_set_ident(device, ident);
@@ -1495,6 +2203,10 @@ int __connman_device_init(const char *device, const char *nodevice)
 {
 	DBG("");
 
+#if defined TIZEN_EXT
+	connection = connman_dbus_get_connection();
+#endif
+
 	if (device)
 		device_filter = g_strsplit(device, ",", -1);
 
@@ -1512,4 +2224,86 @@ void __connman_device_cleanup(void)
 
 	g_strfreev(nodevice_filter);
 	g_strfreev(device_filter);
+
+#if defined TIZEN_EXT
+	dbus_connection_unref(connection);
+#endif
 }
+
+#ifdef TIZEN_EXT
+void connman_device_mac_policy_notify(struct connman_device *device,
+					int result, unsigned int policy)
+{
+	device->mac_policy = policy;
+	__connman_technology_notify_mac_policy_by_device(device, result, policy);
+}
+
+int connman_device_set_mac_policy(struct connman_device *device,
+					unsigned int policy)
+{
+	int err = 0;
+
+	if (!device || !device->driver || !device->driver->set_mac_policy)
+		return -EOPNOTSUPP;
+
+	device->mac_policy = policy;
+	err = device->driver->set_mac_policy(device, policy);
+	return err;
+}
+
+unsigned int connman_device_get_mac_policy(struct connman_device *device)
+{
+	return device->mac_policy;
+}
+
+void connman_device_preassoc_mac_policy_notify(struct connman_device *device,
+					int result, unsigned int policy)
+{
+	device->preassoc_mac_policy = policy;
+	__connman_technology_notify_preassoc_mac_policy_by_device(device, result, policy);
+}
+
+int connman_device_set_preassoc_mac_policy(struct connman_device *device,
+					unsigned int policy)
+{
+	int err = 0;
+
+	if (!device || !device->driver || !device->driver->set_preassoc_mac_policy)
+		return -EOPNOTSUPP;
+
+	device->preassoc_mac_policy = policy;
+	err = device->driver->set_preassoc_mac_policy(device, policy);
+	return err;
+}
+
+unsigned int connman_device_get_preassoc_mac_policy(struct connman_device *device)
+{
+	return device->preassoc_mac_policy;
+}
+
+void connman_device_random_mac_lifetime_notify(struct connman_device *device,
+					int result, unsigned int lifetime)
+{
+	device->random_mac_lifetime = lifetime;
+	__connman_technology_notify_random_mac_lifetime_by_device(device, result, lifetime);
+}
+
+int connman_device_set_random_mac_lifetime(struct connman_device *device,
+					unsigned int lifetime)
+{
+	int err = 0;
+
+	if (!device || !device->driver || !device->driver->set_random_mac_lifetime)
+		return -EOPNOTSUPP;
+
+	device->random_mac_lifetime = lifetime;
+	err = device->driver->set_random_mac_lifetime(device, lifetime);
+	return err;
+}
+
+unsigned int connman_device_get_random_mac_lifetime(struct connman_device *device)
+{
+	return device->random_mac_lifetime;
+}
+
+#endif