*
* 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
/* Calling _technology_rfkill_add will update the tech. */
if (rfkill->type == type)
- __connman_technology_add_rfkill(rfkill->index, type,
+ __connman_technology_add_rfkill(rfkill->index, type,
rfkill->softblock, rfkill->hardblock);
}
technology->regdom = g_strdup(alpha2);
}
+static int set_regdom_by_device(struct connman_technology *technology,
+ const char *alpha2)
+{
+ GSList *list;
+
+ for (list = technology->device_list; list; list = list->next) {
+ struct connman_device *device = list->data;
+
+ if (connman_device_set_regdom(device, alpha2) != 0)
+ return -ENOTSUP;
+ }
+
+ return 0;
+}
+
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->driver == NULL)
- continue;
+ if (set_regdom_by_device(technology, alpha2) != 0) {
+ if (technology->driver == NULL)
+ continue;
- if (technology->driver->set_regdom)
- technology->driver->set_regdom(technology, alpha2);
+ if (technology->driver->set_regdom != NULL)
+ technology->driver->set_regdom(technology,
+ alpha2);
+ }
}
return 0;
return NULL;
}
-static void load_state(struct connman_technology *technology)
+static void save_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) {
- technology->enable_persistent = FALSE;
- return;
- }
+ if (keyfile == NULL)
+ keyfile = g_key_file_new();
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 {
- technology->enable_persistent = FALSE;
- g_clear_error(&error);
- }
+ 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 save_state(struct connman_technology *technology)
+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();
- if (keyfile == NULL)
- keyfile = g_key_file_new();
+ /* 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;
- g_key_file_set_boolean(keyfile, identifier, "Enable",
- technology->enable_persistent);
+ 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);
- __connman_storage_save_global(keyfile);
-
g_key_file_free(keyfile);
return;
/* If there is a error, we enable offlinemode */
keyfile = __connman_storage_load_global();
if (keyfile == NULL)
- return TRUE;
+ return FALSE;
offlinemode = g_key_file_get_boolean(keyfile, "global",
"OfflineMode", &error);
if (error != NULL) {
- offlinemode = TRUE;
+ offlinemode = FALSE;
g_clear_error(&error);
}
technology->pending_timeout = g_timeout_add_seconds(10,
technology_pending_reply, technology);
} else {
- reply = __connman_error_failed(msg, -err);
+ 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);
}
technology->pending_timeout = g_timeout_add_seconds(10,
technology_pending_reply, technology);
} else {
- reply = __connman_error_failed(msg, -err);
+ 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);
}
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);
dbus_message_iter_get_basic(&value, &tethering);
if (technology->tethering == tethering)
- return __connman_error_in_progress(msg);
+ return __connman_error_already_enabled(msg);
err = set_tethering(technology, tethering);
if (err < 0)
if (__connman_device_get_service_type(other_device) != type)
continue;
- if (__connman_device_scanning(other_device))
+ if (connman_device_get_scanning(other_device) == TRUE)
count += 1;
}
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;
return NULL;
}
-static GDBusMethodTable technology_methods[] = {
- { "GetProperties", "", "a{sv}", get_properties },
- { "SetProperty", "sv", "", set_property },
- { "Scan", "", "", scan,
- G_DBUS_METHOD_FLAG_ASYNC },
+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 GDBusSignalTable technology_signals[] = {
- { "PropertyChanged", "sv" },
+static const GDBusSignalTable technology_signals[] = {
+ { GDBUS_SIGNAL("PropertyChanged",
+ GDBUS_ARGS({ "name", "s" }, { "value", "v" })) },
{ },
};
{
DBG("technology %p", technology);
- if (__sync_fetch_and_sub(&technology->refcount, 1) > 0)
+ if (__sync_sub_and_fetch(&technology->refcount, 1) > 0)
return;
reply_scan_pending(technology, -EINTR);
return -ENXIO;
}
- if (technology->enable_persistent && !global_offlinemode)
- __connman_device_enable(device);
+ 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);
return -ENXIO;
}
- if (__connman_device_scanning(device))
- __connman_technology_scan_stopped(device);
-
technology->device_list = g_slist_remove(technology->device_list,
device);
technology_put(technology);
if (technology == NULL)
return -ENXIO;
- if (__sync_fetch_and_add(&technology->enabled, 1) == 0)
- powered_changed(technology);
+ if (__sync_fetch_and_add(&technology->enabled, 1) != 0)
+ return -EALREADY;
+
+ powered_changed(technology);
if (technology->pending_reply != NULL) {
g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
if (technology == NULL)
return -ENXIO;
+ if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
+ return -EINPROGRESS;
+
if (technology->pending_reply != NULL) {
g_dbus_send_reply(connection, technology->pending_reply, DBUS_TYPE_INVALID);
dbus_message_unref(technology->pending_reply);
technology->pending_timeout = 0;
}
- if (__sync_fetch_and_sub(&technology->enabled, 1) == 1)
- powered_changed(technology);
+ powered_changed(technology);
return 0;
}
return 0;
}
- technology = technology_get(type);
+ technology = technology_find(type);
/* If there is no driver for this type, ignore it. */
if (technology == NULL)
return -ENXIO;
global_offlinemode = connman_technology_load_offlinemode();
+ /* This will create settings file if it is missing */
+ connman_technology_save_offlinemode();
+
return 0;
}