X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Ftechnology.c;h=ad555c9bf7d3193d70ae5491bd5189752b9780e8;hb=57156cc5738cfbf60e1b0ddf444ad6eec5964a0d;hp=cb065e2b7cefb19b8707bcca931bc0d506187dfe;hpb=16a3c81f6e336ebc5aed1e1462002833aaebc4fa;p=framework%2Fconnectivity%2Fconnman.git

diff --git a/src/technology.c b/src/technology.c
index cb065e2..ad555c9 100644
--- a/src/technology.c
+++ b/src/technology.c
@@ -2,7 +2,7 @@
  *
  *  Connection Manager
  *
- *  Copyright (C) 2007-2010  Intel Corporation. All rights reserved.
+ *  Copyright (C) 2007-2012  Intel Corporation. All rights reserved.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License version 2 as
@@ -32,10 +32,17 @@
 
 static DBusConnection *connection;
 
-static GHashTable *rfkill_table;
-static GHashTable *device_table;
 static GSList *technology_list = NULL;
 
+/*
+ * List of devices with no technology associated with them either because of
+ * no compiled in support or the driver is not yet loaded.
+*/
+static GSList *techless_device_list = NULL;
+static GHashTable *rfkill_list;
+
+static connman_bool_t global_offlinemode;
+
 struct connman_rfkill {
 	unsigned int index;
 	enum connman_service_type type;
@@ -43,31 +50,28 @@ struct connman_rfkill {
 	connman_bool_t hardblock;
 };
 
-enum connman_technology_state {
-	CONNMAN_TECHNOLOGY_STATE_UNKNOWN   = 0,
-	CONNMAN_TECHNOLOGY_STATE_OFFLINE   = 1,
-	CONNMAN_TECHNOLOGY_STATE_AVAILABLE = 2,
-	CONNMAN_TECHNOLOGY_STATE_ENABLED   = 3,
-	CONNMAN_TECHNOLOGY_STATE_CONNECTED = 4,
-};
-
 struct connman_technology {
-	gint refcount;
+	int refcount;
 	enum connman_service_type type;
-	enum connman_technology_state state;
 	char *path;
-	GHashTable *rfkill_list;
 	GSList *device_list;
-	gint enabled;
-	gint blocked;
+	int enabled;
 	char *regdom;
+	connman_bool_t connected;
 
 	connman_bool_t tethering;
 	char *tethering_ident;
 	char *tethering_passphrase;
 
+	connman_bool_t enable_persistent; /* Save the tech state */
+
 	struct connman_technology_driver *driver;
 	void *driver_data;
+
+	DBusMessage *pending_reply;
+	guint pending_timeout;
+
+	GSList *scan_pending;
 };
 
 static GSList *driver_list = NULL;
@@ -80,6 +84,17 @@ static gint compare_priority(gconstpointer a, gconstpointer b)
 	return driver2->priority - driver1->priority;
 }
 
+static void rfkill_check(gpointer key, gpointer value, gpointer user_data)
+{
+	struct connman_rfkill *rfkill = value;
+	enum connman_service_type type = GPOINTER_TO_INT(user_data);
+
+	/* Calling _technology_rfkill_add will update the tech. */
+	if (rfkill->type == type)
+		__connman_technology_add_rfkill(rfkill->index, type,
+				rfkill->softblock, rfkill->hardblock);
+}
+
 /**
  * connman_technology_driver_register:
  * @driver: Technology driver definition
@@ -91,23 +106,39 @@ static gint compare_priority(gconstpointer a, gconstpointer b)
 int connman_technology_driver_register(struct connman_technology_driver *driver)
 {
 	GSList *list;
-	struct connman_technology *technology;
+	struct connman_device *device;
+	enum connman_service_type type;
 
-	DBG("driver %p name %s", driver, driver->name);
+	DBG("Registering %s driver", driver->name);
 
 	driver_list = g_slist_insert_sorted(driver_list, driver,
 							compare_priority);
 
-	for (list = technology_list; list; list = list->next) {
-		technology = list->data;
+	if (techless_device_list == NULL)
+		goto check_rfkill;
 
-		if (technology->driver != NULL)
+	/*
+	 * Check for technology less devices if this driver
+	 * can service any of them.
+	*/
+	for (list = techless_device_list; list; list = list->next) {
+		device = list->data;
+
+		type = __connman_device_get_service_type(device);
+		if (type != driver->type)
 			continue;
 
-		if (technology->type == driver->type)
-			technology->driver = driver;
+		techless_device_list = g_slist_remove(techless_device_list,
+								device);
+
+		__connman_technology_add_device(device);
 	}
 
+check_rfkill:
+	/* Check for orphaned rfkill switches. */
+	g_hash_table_foreach(rfkill_list, rfkill_check,
+					GINT_TO_POINTER(driver->type));
+
 	return 0;
 }
 
@@ -122,7 +153,7 @@ void connman_technology_driver_unregister(struct connman_technology_driver *driv
 	GSList *list;
 	struct connman_technology *technology;
 
-	DBG("driver %p name %s", driver, driver->name);
+	DBG("Unregistering driver %p name %s", driver, driver->name);
 
 	for (list = technology_list; list; list = list->next) {
 		technology = list->data;
@@ -151,6 +182,8 @@ static void tethering_changed(struct connman_technology *technology)
 void connman_technology_tethering_notify(struct connman_technology *technology,
 							connman_bool_t enabled)
 {
+	GSList *list;
+
 	DBG("technology %p enabled %u", technology, enabled);
 
 	if (technology->tethering == enabled)
@@ -162,14 +195,21 @@ void connman_technology_tethering_notify(struct connman_technology *technology,
 
 	if (enabled == TRUE)
 		__connman_tethering_set_enabled();
-	else
-		__connman_tethering_set_disabled();
+	else {
+		for (list = technology_list; list; list = list->next) {
+			struct connman_technology *other_tech = list->data;
+			if (other_tech->tethering == TRUE)
+				break;
+		}
+		if (list == NULL)
+			__connman_tethering_set_disabled();
+	}
 }
 
 static int set_tethering(struct connman_technology *technology,
-				const char *bridge, connman_bool_t enabled)
+				connman_bool_t enabled)
 {
-	const char *ident, *passphrase;
+	const char *ident, *passphrase, *bridge;
 
 	ident = technology->tethering_ident;
 	passphrase = technology->tethering_passphrase;
@@ -178,6 +218,10 @@ static int set_tethering(struct connman_technology *technology,
 			technology->driver->set_tethering == NULL)
 		return -EOPNOTSUPP;
 
+	bridge = __connman_tethering_get_bridge();
+	if (bridge == NULL)
+		return -EOPNOTSUPP;
+
 	if (technology->type == CONNMAN_SERVICE_TYPE_WIFI &&
 	    (ident == NULL || passphrase == NULL))
 		return -EINVAL;
@@ -200,81 +244,46 @@ void connman_technology_regdom_notify(struct connman_technology *technology,
 	technology->regdom = g_strdup(alpha2);
 }
 
-int connman_technology_set_regdom(const char *alpha2)
+static int set_regdom_by_device(struct connman_technology *technology,
+							const char *alpha2)
 {
 	GSList *list;
 
-	for (list = technology_list; list; list = list->next) {
-		struct connman_technology *technology = list->data;
-
-		if (technology->driver == NULL)
-			continue;
+	for (list = technology->device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
 
-		if (technology->driver->set_regdom)
-			technology->driver->set_regdom(technology, alpha2);
+		if (connman_device_set_regdom(device, alpha2) != 0)
+			return -ENOTSUP;
 	}
 
 	return 0;
 }
 
-static void free_rfkill(gpointer data)
-{
-	struct connman_rfkill *rfkill = data;
-
-	g_free(rfkill);
-}
-
-void __connman_technology_list(DBusMessageIter *iter, void *user_data)
+int connman_technology_set_regdom(const char *alpha2)
 {
 	GSList *list;
 
 	for (list = technology_list; list; list = list->next) {
 		struct connman_technology *technology = list->data;
 
-		if (technology->path == NULL)
-			continue;
+		if (set_regdom_by_device(technology, alpha2) != 0) {
+			if (technology->driver == NULL)
+				continue;
 
-		dbus_message_iter_append_basic(iter, DBUS_TYPE_OBJECT_PATH,
-							&technology->path);
-	}
-}
-
-static void technologies_changed(void)
-{
-	connman_dbus_property_changed_array(CONNMAN_MANAGER_PATH,
-			CONNMAN_MANAGER_INTERFACE, "Technologies",
-			DBUS_TYPE_OBJECT_PATH, __connman_technology_list, NULL);
-}
-
-static const char *state2string(enum connman_technology_state state)
-{
-	switch (state) {
-	case CONNMAN_TECHNOLOGY_STATE_UNKNOWN:
-		break;
-	case CONNMAN_TECHNOLOGY_STATE_OFFLINE:
-		return "offline";
-	case CONNMAN_TECHNOLOGY_STATE_AVAILABLE:
-		return "available";
-	case CONNMAN_TECHNOLOGY_STATE_ENABLED:
-		return "enabled";
-	case CONNMAN_TECHNOLOGY_STATE_CONNECTED:
-		return "connected";
+			if (technology->driver->set_regdom != NULL)
+				technology->driver->set_regdom(technology,
+								alpha2);
+		}
 	}
 
-	return NULL;
+	return 0;
 }
 
-static void state_changed(struct connman_technology *technology)
+static void free_rfkill(gpointer data)
 {
-	const char *str;
-
-	str = state2string(technology->state);
-	if (str == NULL)
-		return;
+	struct connman_rfkill *rfkill = data;
 
-	connman_dbus_property_changed_basic(technology->path,
-				CONNMAN_TECHNOLOGY_INTERFACE, "State",
-						DBUS_TYPE_STRING, &str);
+	g_free(rfkill);
 }
 
 static const char *get_name(enum connman_service_type type)
@@ -295,32 +304,138 @@ static const char *get_name(enum connman_service_type type)
 	case CONNMAN_SERVICE_TYPE_BLUETOOTH:
 		return "Bluetooth";
 	case CONNMAN_SERVICE_TYPE_CELLULAR:
-		return "3G";
+		return "Cellular";
 	}
 
 	return NULL;
 }
 
-static DBusMessage *get_properties(DBusConnection *conn,
-					DBusMessage *message, void *user_data)
+static void save_state(struct connman_technology *technology)
 {
-	struct connman_technology *technology = user_data;
-	DBusMessage *reply;
-	DBusMessageIter array, dict;
-	const char *str;
+	GKeyFile *keyfile;
+	gchar *identifier;
 
-	reply = dbus_message_new_method_return(message);
-	if (reply == NULL)
-		return NULL;
+	DBG("technology %p", technology);
 
-	dbus_message_iter_init_append(reply, &array);
+	keyfile = __connman_storage_load_global();
+	if (keyfile == NULL)
+		keyfile = g_key_file_new();
 
-	connman_dbus_dict_open(&array, &dict);
+	identifier = g_strdup_printf("%s", get_name(technology->type));
+	if (identifier == NULL)
+		goto done;
 
-	str = state2string(technology->state);
-	if (str != NULL)
-		connman_dbus_dict_append_basic(&dict, "State",
-						DBUS_TYPE_STRING, &str);
+	g_key_file_set_boolean(keyfile, identifier, "Enable",
+				technology->enable_persistent);
+
+done:
+	g_free(identifier);
+
+	__connman_storage_save_global(keyfile);
+
+	g_key_file_free(keyfile);
+
+	return;
+}
+
+static void load_state(struct connman_technology *technology)
+{
+	GKeyFile *keyfile;
+	gchar *identifier;
+	GError *error = NULL;
+	connman_bool_t enable;
+
+	DBG("technology %p", technology);
+
+	keyfile = __connman_storage_load_global();
+	/* Fallback on disabling technology if file not found. */
+	if (keyfile == NULL) {
+		if (technology->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+			/* We enable ethernet by default */
+			technology->enable_persistent = TRUE;
+		else
+			technology->enable_persistent = FALSE;
+		return;
+	}
+
+	identifier = g_strdup_printf("%s", get_name(technology->type));
+	if (identifier == NULL)
+		goto done;
+
+	enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
+	if (error == NULL)
+		technology->enable_persistent = enable;
+	else {
+		if (technology->type == CONNMAN_SERVICE_TYPE_ETHERNET)
+			technology->enable_persistent = TRUE;
+		else
+			technology->enable_persistent = FALSE;
+
+		save_state(technology);
+		g_clear_error(&error);
+	}
+done:
+	g_free(identifier);
+
+	g_key_file_free(keyfile);
+
+	return;
+}
+
+connman_bool_t __connman_technology_get_offlinemode(void)
+{
+	return global_offlinemode;
+}
+
+static void connman_technology_save_offlinemode()
+{
+	GKeyFile *keyfile;
+
+	keyfile = __connman_storage_load_global();
+	if (keyfile == NULL)
+		keyfile = g_key_file_new();
+
+	g_key_file_set_boolean(keyfile, "global",
+					"OfflineMode", global_offlinemode);
+
+	__connman_storage_save_global(keyfile);
+
+	g_key_file_free(keyfile);
+
+	return;
+}
+
+static connman_bool_t connman_technology_load_offlinemode()
+{
+	GKeyFile *keyfile;
+	GError *error = NULL;
+	connman_bool_t offlinemode;
+
+	/* If there is a error, we enable offlinemode */
+	keyfile = __connman_storage_load_global();
+	if (keyfile == NULL)
+		return FALSE;
+
+	offlinemode = g_key_file_get_boolean(keyfile, "global",
+						"OfflineMode", &error);
+	if (error != NULL) {
+		offlinemode = FALSE;
+		g_clear_error(&error);
+	}
+
+	g_key_file_free(keyfile);
+
+	return offlinemode;
+}
+
+static void append_properties(DBusMessageIter *iter,
+		struct connman_technology *technology)
+{
+	DBusMessageIter dict;
+	const char *str;
+	connman_bool_t powered;
+
+	connman_dbus_dict_open(iter, &dict);
 
 	str = get_name(technology->type);
 	if (str != NULL)
@@ -332,6 +447,18 @@ static DBusMessage *get_properties(DBusConnection *conn,
 		connman_dbus_dict_append_basic(&dict, "Type",
 						DBUS_TYPE_STRING, &str);
 
+	__sync_synchronize();
+	if (technology->enabled > 0)
+		powered = TRUE;
+	else
+		powered = FALSE;
+	connman_dbus_dict_append_basic(&dict, "Powered",
+					DBUS_TYPE_BOOLEAN, &powered);
+
+	connman_dbus_dict_append_basic(&dict, "Connected",
+					DBUS_TYPE_BOOLEAN,
+					&technology->connected);
+
 	connman_dbus_dict_append_basic(&dict, "Tethering",
 					DBUS_TYPE_BOOLEAN,
 					&technology->tethering);
@@ -346,11 +473,236 @@ static DBusMessage *get_properties(DBusConnection *conn,
 						DBUS_TYPE_STRING,
 						&technology->tethering_passphrase);
 
-	connman_dbus_dict_close(&array, &dict);
+	connman_dbus_dict_close(iter, &dict);
+}
+
+static void technology_added_signal(struct connman_technology *technology)
+{
+	DBusMessage *signal;
+	DBusMessageIter iter;
+
+	signal = dbus_message_new_signal(CONNMAN_MANAGER_PATH,
+			CONNMAN_MANAGER_INTERFACE, "TechnologyAdded");
+	if (signal == NULL)
+		return;
+
+	dbus_message_iter_init_append(signal, &iter);
+	dbus_message_iter_append_basic(&iter, DBUS_TYPE_OBJECT_PATH,
+							&technology->path);
+	append_properties(&iter, technology);
+
+	dbus_connection_send(connection, signal, NULL);
+	dbus_message_unref(signal);
+}
+
+static void technology_removed_signal(struct connman_technology *technology)
+{
+	g_dbus_emit_signal(connection, CONNMAN_MANAGER_PATH,
+			CONNMAN_MANAGER_INTERFACE, "TechnologyRemoved",
+			DBUS_TYPE_OBJECT_PATH, &technology->path,
+			DBUS_TYPE_INVALID);
+}
+
+static DBusMessage *get_properties(DBusConnection *conn,
+					DBusMessage *message, void *user_data)
+{
+	struct connman_technology *technology = user_data;
+	DBusMessage *reply;
+	DBusMessageIter iter;
+
+	reply = dbus_message_new_method_return(message);
+	if (reply == NULL)
+		return NULL;
+
+	dbus_message_iter_init_append(reply, &iter);
+	append_properties(&iter, technology);
 
 	return reply;
 }
 
+void __connman_technology_list_struct(DBusMessageIter *array)
+{
+	GSList *list;
+	DBusMessageIter entry;
+
+	for (list = technology_list; list; list = list->next) {
+		struct connman_technology *technology = list->data;
+
+		if (technology->path == NULL)
+			continue;
+
+		dbus_message_iter_open_container(array, DBUS_TYPE_STRUCT,
+				NULL, &entry);
+		dbus_message_iter_append_basic(&entry, DBUS_TYPE_OBJECT_PATH,
+				&technology->path);
+		append_properties(&entry, technology);
+		dbus_message_iter_close_container(array, &entry);
+	}
+}
+
+static gboolean technology_pending_reply(gpointer user_data)
+{
+	struct connman_technology *technology = user_data;
+	DBusMessage *reply;
+
+	/* Power request timedout, send ETIMEDOUT. */
+	if (technology->pending_reply != NULL) {
+		reply = __connman_error_failed(technology->pending_reply, ETIMEDOUT);
+		if (reply != NULL)
+			g_dbus_send_message(connection, reply);
+
+		dbus_message_unref(technology->pending_reply);
+		technology->pending_reply = NULL;
+		technology->pending_timeout = 0;
+	}
+
+	return FALSE;
+}
+
+static int technology_enable(struct connman_technology *technology,
+		DBusMessage *msg)
+{
+	GSList *list;
+	int err = 0;
+	int ret = -ENODEV;
+	DBusMessage *reply;
+
+	DBG("technology %p enable", technology);
+
+	__sync_synchronize();
+	if (technology->enabled > 0) {
+		err = -EALREADY;
+		goto done;
+	}
+
+	if (technology->pending_reply != NULL) {
+		err = -EBUSY;
+		goto done;
+	}
+
+	if (msg != NULL) {
+		/*
+		 * This is a bit of a trick. When msg is not NULL it means
+		 * thats technology_enable was invoked from the manager API.
+		 * Hence we save the state here.
+		 */
+		technology->enable_persistent = TRUE;
+		save_state(technology);
+	}
+
+	__connman_rfkill_block(technology->type, FALSE);
+
+	/*
+	 * An empty device list means that devices in the technology
+	 * were rfkill blocked. The unblock above will enable the devs.
+	 */
+	if (technology->device_list == NULL) {
+		ret = 0;
+		goto done;
+	}
+
+	for (list = technology->device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
+
+		err = __connman_device_enable(device);
+		/*
+		 * err = 0 : Device was enabled right away.
+		 * If atleast one device gets enabled, we consider
+		 * the technology to be enabled.
+		 */
+		if (err == 0)
+			ret = 0;
+	}
+
+done:
+	if (ret == 0) {
+		if (msg != NULL)
+			g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+		return ret;
+	}
+
+	if (msg != NULL) {
+		if (err == -EINPROGRESS) {
+			technology->pending_reply = dbus_message_ref(msg);
+			technology->pending_timeout = g_timeout_add_seconds(10,
+					technology_pending_reply, technology);
+		} else {
+			if (err == -EALREADY)
+				reply = __connman_error_already_enabled(msg);
+			else
+				reply = __connman_error_failed(msg, -err);
+			if (reply != NULL)
+				g_dbus_send_message(connection, reply);
+		}
+	}
+
+	return err;
+}
+
+static int technology_disable(struct connman_technology *technology,
+		DBusMessage *msg)
+{
+	GSList *list;
+	int err = 0;
+	int ret = -ENODEV;
+	DBusMessage *reply;
+
+	DBG("technology %p disable", technology);
+
+	__sync_synchronize();
+	if (technology->enabled == 0) {
+		err = -EALREADY;
+		goto done;
+	}
+
+	if (technology->pending_reply != NULL) {
+		err = -EBUSY;
+		goto done;
+	}
+
+	if (technology->tethering == TRUE)
+		set_tethering(technology, FALSE);
+
+	if (msg != NULL) {
+		technology->enable_persistent = FALSE;
+		save_state(technology);
+	}
+
+	__connman_rfkill_block(technology->type, TRUE);
+
+	for (list = technology->device_list; list; list = list->next) {
+		struct connman_device *device = list->data;
+
+		err = __connman_device_disable(device);
+		if (err == 0)
+			ret = 0;
+	}
+
+done:
+	if (ret == 0) {
+		if (msg != NULL)
+			g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
+		return ret;
+	}
+
+	if (msg != NULL) {
+		if (err == -EINPROGRESS) {
+			technology->pending_reply = dbus_message_ref(msg);
+			technology->pending_timeout = g_timeout_add_seconds(10,
+					technology_pending_reply, technology);
+		} else {
+			if (err == -EALREADY)
+				reply = __connman_error_already_disabled(msg);
+			else
+				reply = __connman_error_failed(msg, -err);
+			if (reply != NULL)
+				g_dbus_send_message(connection, reply);
+		}
+	}
+
+	return err;
+}
+
 static DBusMessage *set_property(DBusConnection *conn,
 					DBusMessage *msg, void *data)
 {
@@ -364,8 +716,15 @@ static DBusMessage *set_property(DBusConnection *conn,
 	if (dbus_message_iter_init(msg, &iter) == FALSE)
 		return __connman_error_invalid_arguments(msg);
 
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)
+		return __connman_error_invalid_arguments(msg);
+
 	dbus_message_iter_get_basic(&iter, &name);
 	dbus_message_iter_next(&iter);
+
+	if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_VARIANT)
+		return __connman_error_invalid_arguments(msg);
+
 	dbus_message_iter_recurse(&iter, &value);
 
 	type = dbus_message_iter_get_arg_type(&value);
@@ -375,7 +734,6 @@ static DBusMessage *set_property(DBusConnection *conn,
 	if (g_str_equal(name, "Tethering") == TRUE) {
 		int err;
 		connman_bool_t tethering;
-		const char *bridge;
 
 		if (type != DBUS_TYPE_BOOLEAN)
 			return __connman_error_invalid_arguments(msg);
@@ -383,13 +741,9 @@ static DBusMessage *set_property(DBusConnection *conn,
 		dbus_message_iter_get_basic(&value, &tethering);
 
 		if (technology->tethering == tethering)
-			return __connman_error_in_progress(msg);
-
-		bridge = __connman_tethering_get_bridge();
-		if (bridge == NULL)
-			return __connman_error_not_supported(msg);
+			return __connman_error_already_enabled(msg);
 
-		err = set_tethering(technology, bridge, tethering);
+		err = set_tethering(technology, tethering);
 		if (err < 0)
 			return __connman_error_failed(msg, -err);
 
@@ -414,23 +768,24 @@ static DBusMessage *set_property(DBusConnection *conn,
 			return __connman_error_invalid_arguments(msg);
 
 		technology->tethering_passphrase = g_strdup(str);
+	} else if (g_str_equal(name, "Powered") == TRUE) {
+		connman_bool_t enable;
+
+		if (type != DBUS_TYPE_BOOLEAN)
+			return __connman_error_invalid_arguments(msg);
+
+		dbus_message_iter_get_basic(&value, &enable);
+		if (enable == TRUE)
+			technology_enable(technology, msg);
+		else
+			technology_disable(technology, msg);
+
 	} else
 		return __connman_error_invalid_property(msg);
 
 	return g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
 }
 
-static GDBusMethodTable technology_methods[] = {
-	{ "GetProperties", "",   "a{sv}", get_properties },
-	{ "SetProperty",   "sv", "",      set_property   },
-	{ },
-};
-
-static GDBusSignalTable technology_signals[] = {
-	{ "PropertyChanged", "sv" },
-	{ },
-};
-
 static struct connman_technology *technology_find(enum connman_service_type type)
 {
 	GSList *list;
@@ -447,23 +802,163 @@ static struct connman_technology *technology_find(enum connman_service_type type
 	return NULL;
 }
 
+static void reply_scan_pending(struct connman_technology *technology, int err)
+{
+	DBusMessage *reply;
+
+	DBG("technology %p err %d", technology, err);
+
+	while (technology->scan_pending != NULL) {
+		DBusMessage *msg = technology->scan_pending->data;
+
+		DBG("reply to %s", dbus_message_get_sender(msg));
+
+		if (err == 0)
+			reply = g_dbus_create_reply(msg, DBUS_TYPE_INVALID);
+		else
+			reply = __connman_error_failed(msg, -err);
+		g_dbus_send_message(connection, reply);
+		dbus_message_unref(msg);
+
+		technology->scan_pending =
+			g_slist_delete_link(technology->scan_pending,
+					technology->scan_pending);
+	}
+}
+
+void __connman_technology_scan_started(struct connman_device *device)
+{
+	DBG("device %p", device);
+}
+
+void __connman_technology_scan_stopped(struct connman_device *device)
+{
+	int count = 0;
+	struct connman_technology *technology;
+	enum connman_service_type type;
+	GSList *list;
+
+	type = __connman_device_get_service_type(device);
+	technology = technology_find(type);
+
+	DBG("technology %p device %p", technology, device);
+
+	if (technology == NULL)
+		return;
+
+	for (list = technology->device_list; list != NULL; list = list->next) {
+		struct connman_device *other_device = list->data;
+
+		if (device == other_device)
+			continue;
+
+		if (__connman_device_get_service_type(other_device) != type)
+			continue;
+
+		if (connman_device_get_scanning(other_device) == TRUE)
+			count += 1;
+	}
+
+	if (count == 0)
+		reply_scan_pending(technology, 0);
+}
+
+void __connman_technology_notify_regdom_by_device(struct connman_device *device,
+						int result, const char *alpha2)
+{
+	struct connman_technology *technology;
+	enum connman_service_type type;
+
+	type = __connman_device_get_service_type(device);
+	technology = technology_find(type);
+
+	if (technology == NULL)
+		return;
+
+	if (result < 0) {
+		if (technology->driver != NULL &&
+				technology->driver->set_regdom != NULL) {
+			technology->driver->set_regdom(technology, alpha2);
+			return;
+		}
+
+		alpha2 = NULL;
+	}
+
+	connman_technology_regdom_notify(technology, alpha2);
+}
+
+static DBusMessage *scan(DBusConnection *conn, DBusMessage *msg, void *data)
+{
+	struct connman_technology *technology = data;
+	int err;
+
+	DBG ("technology %p request from %s", technology,
+			dbus_message_get_sender(msg));
+
+	dbus_message_ref(msg);
+	technology->scan_pending =
+		g_slist_prepend(technology->scan_pending, msg);
+
+	err = __connman_device_request_scan(technology->type);
+	if (err < 0)
+		reply_scan_pending(technology, err);
+
+	return NULL;
+}
+
+static const GDBusMethodTable technology_methods[] = {
+	{ GDBUS_DEPRECATED_METHOD("GetProperties",
+			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
+			get_properties) },
+	{ GDBUS_METHOD("SetProperty",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
+			NULL, set_property) },
+	{ GDBUS_ASYNC_METHOD("Scan", NULL, NULL, scan) },
+	{ },
+};
+
+static const GDBusSignalTable technology_signals[] = {
+	{ GDBUS_SIGNAL("PropertyChanged",
+			GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
+	{ },
+};
+
 static struct connman_technology *technology_get(enum connman_service_type type)
 {
 	struct connman_technology *technology;
+	struct connman_technology_driver *driver = NULL;
 	const char *str;
 	GSList *list;
+	int err;
 
 	DBG("type %d", type);
 
+	str = __connman_service_type2string(type);
+	if (str == NULL)
+		return NULL;
+
 	technology = technology_find(type);
 	if (technology != NULL) {
-		g_atomic_int_inc(&technology->refcount);
-		goto done;
+		__sync_fetch_and_add(&technology->refcount, 1);
+		return technology;
 	}
 
-	str = __connman_service_type2string(type);
-	if (str == NULL)
+	/* First check if we have a driver for this technology type */
+	for (list = driver_list; list; list = list->next) {
+		driver = list->data;
+
+		if (driver->type == type)
+			break;
+		else
+			driver = NULL;
+	}
+
+	if (driver == NULL) {
+		DBG("No matching driver found for %s.",
+				__connman_service_type2string(type));
 		return NULL;
+	}
 
 	technology = g_try_new0(struct connman_technology, 1);
 	if (technology == NULL)
@@ -475,11 +970,11 @@ static struct connman_technology *technology_get(enum connman_service_type type)
 	technology->path = g_strdup_printf("%s/technology/%s",
 							CONNMAN_PATH, str);
 
-	technology->rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
-							NULL, free_rfkill);
 	technology->device_list = NULL;
 
-	technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
+	technology->pending_reply = NULL;
+
+	load_state(technology);
 
 	if (g_dbus_register_interface(connection, technology->path,
 					CONNMAN_TECHNOLOGY_INTERFACE,
@@ -492,26 +987,13 @@ static struct connman_technology *technology_get(enum connman_service_type type)
 
 	technology_list = g_slist_append(technology_list, technology);
 
-	technologies_changed();
-
-	if (technology->driver != NULL)
-		goto done;
-
-	for (list = driver_list; list; list = list->next) {
-		struct connman_technology_driver *driver = list->data;
-
-		DBG("driver %p name %s", driver, driver->name);
-
-		if (driver->type != technology->type)
-			continue;
+	technology_added_signal(technology);
 
-		if (driver->probe(technology) == 0) {
-			technology->driver = driver;
-			break;
-		}
-	}
+	technology->driver = driver;
+	err = driver->probe(technology);
+	if (err != 0)
+		DBG("Driver probe failed for technology %p", technology);
 
-done:
 	DBG("technology %p", technology);
 
 	return technology;
@@ -521,9 +1003,11 @@ static void technology_put(struct connman_technology *technology)
 {
 	DBG("technology %p", technology);
 
-	if (g_atomic_int_dec_and_test(&technology->refcount) == FALSE)
+	if (__sync_sub_and_fetch(&technology->refcount, 1) > 0)
 		return;
 
+	reply_scan_pending(technology, -EINTR);
+
 	if (technology->driver) {
 		technology->driver->remove(technology);
 		technology->driver = NULL;
@@ -531,13 +1015,12 @@ static void technology_put(struct connman_technology *technology)
 
 	technology_list = g_slist_remove(technology_list, technology);
 
-	technologies_changed();
+	technology_removed_signal(technology);
 
 	g_dbus_unregister_interface(connection, technology->path,
 						CONNMAN_TECHNOLOGY_INTERFACE);
 
 	g_slist_free(technology->device_list);
-	g_hash_table_destroy(technology->rfkill_list);
 
 	g_free(technology->path);
 	g_free(technology->regdom);
@@ -564,10 +1047,10 @@ void __connman_technology_add_interface(enum connman_service_type type,
 		break;
 	}
 
-	connman_info("Create interface %s [ %s ]", name,
+	connman_info("Adding interface %s [ %s ]", name,
 				__connman_service_type2string(type));
 
-	technology = technology_get(type);
+	technology = technology_find(type);
 
 	if (technology == NULL || technology->driver == NULL
 			|| technology->driver->add_interface == NULL)
@@ -607,15 +1090,6 @@ void __connman_technology_remove_interface(enum connman_service_type type,
 
 	if (technology->driver->remove_interface)
 		technology->driver->remove_interface(technology, index);
-
-	technology_put(technology);
-}
-
-static void unregister_technology(gpointer data)
-{
-	struct connman_technology *technology = data;
-
-	technology_put(technology);
 }
 
 int __connman_technology_add_device(struct connman_device *device)
@@ -626,22 +1100,33 @@ int __connman_technology_add_device(struct connman_device *device)
 	DBG("device %p", device);
 
 	type = __connman_device_get_service_type(device);
-	__connman_notifier_register(type);
 
 	technology = technology_get(type);
-	if (technology == NULL)
-		return -ENXIO;
-
-	g_hash_table_insert(device_table, device, technology);
-
-	if (g_atomic_int_get(&technology->blocked))
-		goto done;
-
-	technology->state = CONNMAN_TECHNOLOGY_STATE_AVAILABLE;
+	if (technology == NULL) {
+		/*
+		 * Since no driver can be found for this device at the moment we
+		 * add it to the techless device list.
+		*/
+		techless_device_list = g_slist_prepend(techless_device_list,
+								device);
 
-	state_changed(technology);
+		return -ENXIO;
+	}
 
-done:
+	if (technology->enable_persistent && !global_offlinemode) {
+		int err = __connman_device_enable(device);
+		/*
+		 * connman_technology_add_device() calls __connman_device_enable()
+		 * but since the device is already enabled, the calls does not
+		 * propagate through to connman_technology_enabled via
+		 * connman_device_set_powered.
+		 */
+		if (err == -EALREADY)
+			__connman_technology_enabled(type);
+	}
+	/* if technology persistent state is offline */
+	if (!technology->enable_persistent)
+		__connman_device_disable(device);
 
 	technology->device_list = g_slist_append(technology->device_list,
 								device);
@@ -657,24 +1142,36 @@ int __connman_technology_remove_device(struct connman_device *device)
 	DBG("device %p", device);
 
 	type = __connman_device_get_service_type(device);
-	__connman_notifier_unregister(type);
 
-	technology = g_hash_table_lookup(device_table, device);
-	if (technology == NULL)
+	technology = technology_find(type);
+	if (technology == NULL) {
+		techless_device_list = g_slist_remove(techless_device_list,
+								device);
 		return -ENXIO;
+	}
 
 	technology->device_list = g_slist_remove(technology->device_list,
 								device);
-	if (technology->device_list == NULL) {
-		technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-		state_changed(technology);
-	}
-
-	g_hash_table_remove(device_table, device);
+	technology_put(technology);
 
 	return 0;
 }
 
+static void powered_changed(struct connman_technology *technology)
+{
+	connman_bool_t powered;
+
+	__sync_synchronize();
+	if (technology->enabled >0)
+		powered = TRUE;
+	else
+		powered = FALSE;
+
+	connman_dbus_property_changed_basic(technology->path,
+			CONNMAN_TECHNOLOGY_INTERFACE, "Powered",
+			DBUS_TYPE_BOOLEAN, &powered);
+}
+
 int __connman_technology_enabled(enum connman_service_type type)
 {
 	struct connman_technology *technology;
@@ -683,112 +1180,103 @@ int __connman_technology_enabled(enum connman_service_type type)
 	if (technology == NULL)
 		return -ENXIO;
 
-	if (g_atomic_int_get(&technology->blocked))
-		return -ERFKILL;
+	if (__sync_fetch_and_add(&technology->enabled, 1) != 0)
+		return -EALREADY;
 
-	__connman_notifier_enable(type);
+	powered_changed(technology);
 
-	if (g_atomic_int_exchange_and_add(&technology->enabled, 1) == 0) {
-		technology->state = CONNMAN_TECHNOLOGY_STATE_ENABLED;
-		state_changed(technology);
+	if (technology->pending_reply != NULL) {
+		g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
+		dbus_message_unref(technology->pending_reply);
+		g_source_remove(technology->pending_timeout);
+		technology->pending_reply = NULL;
+		technology->pending_timeout = 0;
 	}
 
 	return 0;
 }
 
-int __connman_technology_enable(enum connman_service_type type)
+int __connman_technology_disabled(enum connman_service_type type)
 {
 	struct connman_technology *technology;
-	GSList *list;
-	int err;
-	int ret = -ENODEV;
-
-	DBG("type %d enable", type);
 
 	technology = technology_find(type);
 	if (technology == NULL)
 		return -ENXIO;
 
-	for (list = technology->device_list; list; list = list->next) {
-		struct connman_device *device = list->data;
+	if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
+		return -EINPROGRESS;
 
-		err = __connman_device_enable_persistent(device);
-		/*
-		 * err = 0 : Device was enabled right away.
-		 * err = -EINPROGRESS : DBus call was successful.
-		 * If atleast one device gets enabled, we consider
-		 * the technology to be enabled.
-		 */
-		if (err == 0 || err == -EINPROGRESS)
-			ret = 0;
+	if (technology->pending_reply != NULL) {
+		g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
+		dbus_message_unref(technology->pending_reply);
+		g_source_remove(technology->pending_timeout);
+		technology->pending_reply = NULL;
+		technology->pending_timeout = 0;
 	}
 
-	return ret;
+	powered_changed(technology);
+
+	return 0;
 }
 
-int __connman_technology_disabled(enum connman_service_type type)
+int __connman_technology_set_offlinemode(connman_bool_t offlinemode)
 {
-	struct connman_technology *technology;
 	GSList *list;
+	int err = -EINVAL;
 
-	technology = technology_find(type);
-	if (technology == NULL)
-		return -ENXIO;
+	if (global_offlinemode == offlinemode)
+		return 0;
 
-	if (g_atomic_int_dec_and_test(&technology->enabled) == TRUE) {
-		__connman_notifier_disable(type);
+	DBG("offlinemode %s", offlinemode ? "On" : "Off");
 
-		technology->state = CONNMAN_TECHNOLOGY_STATE_AVAILABLE;
-		state_changed(technology);
-	}
+	/*
+	 * This is a bit tricky. When you set offlinemode, there is no
+	 * way to differentiate between attempting offline mode and
+	 * resuming offlinemode from last saved profile. We need that
+	 * information in rfkill_update, otherwise it falls back on the
+	 * technology's persistent state. Hence we set the offline mode here
+	 * but save it & call the notifier only if its successful.
+	 */
 
-	for (list = technology->device_list; list; list = list->next) {
-		struct connman_device *device = list->data;
+	global_offlinemode = offlinemode;
 
-		if (__connman_device_get_blocked(device) == FALSE)
-			return 0;
+	/* Traverse technology list, enable/disable each technology. */
+	for (list = technology_list; list; list = list->next) {
+		struct connman_technology *technology = list->data;
+
+		if (offlinemode)
+			err = technology_disable(technology, NULL);
+
+		if (!offlinemode && technology->enable_persistent)
+			err = technology_enable(technology, NULL);
 	}
 
-	technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-	state_changed(technology);
+	if (err == 0 || err == -EINPROGRESS || err == -EALREADY) {
+		connman_technology_save_offlinemode();
+		__connman_notifier_offlinemode(offlinemode);
+	} else
+		global_offlinemode = connman_technology_load_offlinemode();
 
-	return 0;
+	return err;
 }
 
-int __connman_technology_disable(enum connman_service_type type)
+void __connman_technology_set_connected(enum connman_service_type type,
+		connman_bool_t connected)
 {
 	struct connman_technology *technology;
-	GSList *list;
-	int err;
-	int ret = -ENODEV;
-
-	DBG("type %d disable", type);
 
 	technology = technology_find(type);
 	if (technology == NULL)
-		return -ENXIO;
-
-	for (list = technology->device_list; list; list = list->next) {
-		struct connman_device *device = list->data;
-
-		err = __connman_device_disable_persistent(device);
-		if (err == 0 || err == -EINPROGRESS)
-			ret = 0;
-	}
-
-	return ret;
-}
+		return;
 
-static void technology_blocked(struct connman_technology *technology,
-				connman_bool_t blocked)
-{
-	GSList *list;
+	DBG("technology %p connected %d", technology, connected);
 
-	for (list = technology->device_list; list; list = list->next) {
-		struct connman_device *device = list->data;
+	technology->connected = connected;
 
-		__connman_device_set_blocked(device, blocked);
-	}
+	connman_dbus_property_changed_basic(technology->path,
+			CONNMAN_TECHNOLOGY_INTERFACE, "Connected",
+			DBUS_TYPE_BOOLEAN, &connected);
 }
 
 int __connman_technology_add_rfkill(unsigned int index,
@@ -798,14 +1286,13 @@ int __connman_technology_add_rfkill(unsigned int index,
 {
 	struct connman_technology *technology;
 	struct connman_rfkill *rfkill;
-	connman_bool_t blocked;
 
 	DBG("index %u type %d soft %u hard %u", index, type,
 							softblock, hardblock);
 
-	technology = technology_get(type);
-	if (technology == NULL)
-		return -ENXIO;
+	rfkill = g_hash_table_lookup(rfkill_list, &index);
+	if (rfkill != NULL)
+		goto done;
 
 	rfkill = g_try_new0(struct connman_rfkill, 1);
 	if (rfkill == NULL)
@@ -816,118 +1303,99 @@ int __connman_technology_add_rfkill(unsigned int index,
 	rfkill->softblock = softblock;
 	rfkill->hardblock = hardblock;
 
-	g_hash_table_replace(rfkill_table, &rfkill->index, technology);
+	g_hash_table_insert(rfkill_list, &rfkill->index, rfkill);
 
-	g_hash_table_replace(technology->rfkill_list, &rfkill->index, rfkill);
+done:
+	technology = technology_get(type);
+	/* If there is no driver for this type, ignore it. */
+	if (technology == NULL)
+		return -ENXIO;
 
-	blocked = (softblock || hardblock) ? TRUE : FALSE;
-	if (blocked == FALSE)
+	if (hardblock) {
+		DBG("%s is switched off.", get_name(type));
 		return 0;
+	}
 
-	if (g_atomic_int_exchange_and_add(&technology->blocked, 1) == 0) {
-		technology_blocked(technology, TRUE);
-
-		technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-		state_changed(technology);
+	/*
+	 * If Offline mode is on, we softblock the device if it isnt already.
+	 * If Offline mode is off, we rely on the persistent state of tech.
+	 */
+	if (global_offlinemode) {
+		if (!softblock)
+			return __connman_rfkill_block(type, TRUE);
+	} else {
+		if (technology->enable_persistent && softblock)
+			return __connman_rfkill_block(type, FALSE);
+		/* if technology persistent state is offline */
+		if (!technology->enable_persistent && !softblock)
+			return __connman_rfkill_block(type, TRUE);
 	}
 
 	return 0;
 }
 
 int __connman_technology_update_rfkill(unsigned int index,
+					enum connman_service_type type,
 						connman_bool_t softblock,
 						connman_bool_t hardblock)
 {
 	struct connman_technology *technology;
 	struct connman_rfkill *rfkill;
-	connman_bool_t blocked, old_blocked;
 
 	DBG("index %u soft %u hard %u", index, softblock, hardblock);
 
-	technology = g_hash_table_lookup(rfkill_table, &index);
-	if (technology == NULL)
-		return -ENXIO;
-
-	rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+	rfkill = g_hash_table_lookup(rfkill_list, &index);
 	if (rfkill == NULL)
 		return -ENXIO;
 
-	old_blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE;
-	blocked = (softblock || hardblock) ? TRUE : FALSE;
+	if (rfkill->softblock == softblock &&
+		rfkill->hardblock == hardblock)
+		return 0;
 
 	rfkill->softblock = softblock;
 	rfkill->hardblock = hardblock;
 
-	if (blocked == old_blocked)
+	if (hardblock) {
+		DBG("%s is switched off.", get_name(type));
 		return 0;
+	}
 
-	if (blocked) {
-		guint n_blocked;
-
-		n_blocked =
-			g_atomic_int_exchange_and_add(&technology->blocked, 1);
-		if (n_blocked != g_hash_table_size(technology->rfkill_list) - 1)
-			return 0;
-
-		technology_blocked(technology, blocked);
-		technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
-		state_changed(technology);
-	} else {
-		if (g_atomic_int_dec_and_test(&technology->blocked) == FALSE)
-			return 0;
+	technology = technology_find(type);
+	/* If there is no driver for this type, ignore it. */
+	if (technology == NULL)
+		return -ENXIO;
 
-		technology_blocked(technology, blocked);
-		technology->state = CONNMAN_TECHNOLOGY_STATE_AVAILABLE;
-		state_changed(technology);
+	if (!global_offlinemode) {
+		if (technology->enable_persistent && softblock)
+			return __connman_rfkill_block(type, FALSE);
+		if (!technology->enable_persistent && !softblock)
+			return __connman_rfkill_block(type, TRUE);
 	}
 
 	return 0;
 }
 
-int __connman_technology_remove_rfkill(unsigned int index)
+int __connman_technology_remove_rfkill(unsigned int index,
+					enum connman_service_type type)
 {
 	struct connman_technology *technology;
 	struct connman_rfkill *rfkill;
-	connman_bool_t blocked;
 
 	DBG("index %u", index);
 
-	technology = g_hash_table_lookup(rfkill_table, &index);
-	if (technology == NULL)
-		return -ENXIO;
-
-	rfkill = g_hash_table_lookup(technology->rfkill_list, &index);
+	rfkill = g_hash_table_lookup(rfkill_list, &index);
 	if (rfkill == NULL)
 		return -ENXIO;
 
-	blocked = (rfkill->softblock || rfkill->hardblock) ? TRUE : FALSE;
-
-	g_hash_table_remove(technology->rfkill_list, &index);
-
-	g_hash_table_remove(rfkill_table, &index);
-
-	if (blocked &&
-		g_atomic_int_dec_and_test(&technology->blocked) == TRUE) {
-		technology_blocked(technology, FALSE);
-		technology->state = CONNMAN_TECHNOLOGY_STATE_AVAILABLE;
-		state_changed(technology);
-	}
-
-	return 0;
-}
-
-connman_bool_t __connman_technology_get_blocked(enum connman_service_type type)
-{
-	struct connman_technology *technology;
+	g_hash_table_remove(rfkill_list, &index);
 
 	technology = technology_find(type);
 	if (technology == NULL)
-		return FALSE;
+		return -ENXIO;
 
-	if (g_atomic_int_get(&technology->blocked))
-		return TRUE;
+	technology_put(technology);
 
-	return FALSE;
+	return 0;
 }
 
 int __connman_technology_init(void)
@@ -936,10 +1404,13 @@ int __connman_technology_init(void)
 
 	connection = connman_dbus_get_connection();
 
-	rfkill_table = g_hash_table_new_full(g_int_hash, g_int_equal,
-						NULL, unregister_technology);
-	device_table = g_hash_table_new_full(g_direct_hash, g_direct_equal,
-						NULL, unregister_technology);
+	rfkill_list = g_hash_table_new_full(g_int_hash, g_int_equal,
+							NULL, free_rfkill);
+
+	global_offlinemode = connman_technology_load_offlinemode();
+
+	/* This will create settings file if it is missing */
+	connman_technology_save_offlinemode();
 
 	return 0;
 }
@@ -948,8 +1419,7 @@ void __connman_technology_cleanup(void)
 {
 	DBG("");
 
-	g_hash_table_destroy(device_table);
-	g_hash_table_destroy(rfkill_table);
+	g_hash_table_destroy(rfkill_list);
 
 	dbus_connection_unref(connection);
 }