};
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;
+ int enabled;
char *regdom;
connman_bool_t tethering;
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)
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;
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;
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
return "Bluetooth";
case CONNMAN_SERVICE_TYPE_CELLULAR:
- return "3G";
+ return "Cellular";
}
return NULL;
}
-static int load_state(struct connman_technology *technology)
+static void load_state(struct connman_technology *technology)
{
GKeyFile *keyfile;
gchar *identifier;
DBG("technology %p", technology);
- keyfile = __connman_storage_open_profile("default");
- if (keyfile == NULL)
- return 0;
+ keyfile = __connman_storage_load_global();
+ /* Fallback on disabling technology if file not found. */
+ if (keyfile == NULL) {
+ technology->enable_persistent = FALSE;
+ return;
+ }
identifier = g_strdup_printf("%s", get_name(technology->type));
if (identifier == NULL)
enable = g_key_file_get_boolean(keyfile, identifier, "Enable", &error);
if (error == NULL)
technology->enable_persistent = enable;
- else
+ else {
technology->enable_persistent = FALSE;
-
- g_clear_error(&error);
+ g_clear_error(&error);
+ }
done:
g_free(identifier);
- __connman_storage_close_profile("default", keyfile, FALSE);
+ g_key_file_free(keyfile);
- return 0;
+ return;
}
-static int save_state(struct connman_technology *technology)
+static void save_state(struct connman_technology *technology)
{
GKeyFile *keyfile;
gchar *identifier;
DBG("technology %p", technology);
- keyfile = __connman_storage_open_profile("default");
+ keyfile = __connman_storage_load_global();
if (keyfile == NULL)
- return 0;
+ keyfile = g_key_file_new();
identifier = g_strdup_printf("%s", get_name(technology->type));
if (identifier == NULL)
done:
g_free(identifier);
- __connman_storage_close_profile("default", keyfile, TRUE);
+ __connman_storage_save_global(keyfile);
- return 0;
+ g_key_file_free(keyfile);
+
+ return;
}
connman_bool_t __connman_technology_get_offlinemode(void)
return global_offlinemode;
}
-static int connman_technology_save_offlinemode()
+static void connman_technology_save_offlinemode()
{
GKeyFile *keyfile;
- keyfile = __connman_storage_open_profile("default");
+ keyfile = __connman_storage_load_global();
if (keyfile == NULL)
- return -EIO;
+ keyfile = g_key_file_new();
g_key_file_set_boolean(keyfile, "global",
"OfflineMode", global_offlinemode);
- __connman_storage_close_profile("default", keyfile, TRUE);
+ __connman_storage_save_global(keyfile);
- return 0;
+ g_key_file_free(keyfile);
+
+ return;
}
static connman_bool_t connman_technology_load_offlinemode()
connman_bool_t offlinemode;
/* If there is a error, we enable offlinemode */
- keyfile = __connman_storage_open_profile("default");
+ keyfile = __connman_storage_load_global();
if (keyfile == NULL)
return TRUE;
offlinemode = TRUE;
g_clear_error(&error);
}
- __connman_storage_close_profile("default", keyfile, FALSE);
+
+ g_key_file_free(keyfile);
return offlinemode;
}
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);
if (technology->tethering == tethering)
return __connman_error_in_progress(msg);
- bridge = __connman_tethering_get_bridge();
- if (bridge == NULL)
- return __connman_error_not_supported(msg);
-
- err = set_tethering(technology, bridge, tethering);
+ err = set_tethering(technology, tethering);
if (err < 0)
return __connman_error_failed(msg, -err);
technology = technology_find(type);
if (technology != NULL) {
- g_atomic_int_inc(&technology->refcount);
+ __sync_fetch_and_add(&technology->refcount, 1);
goto done;
}
{
DBG("technology %p", technology);
- if (g_atomic_int_dec_and_test(&technology->refcount) == FALSE)
+ if (__sync_fetch_and_sub(&technology->refcount, 1) != 1)
return;
if (technology->driver) {
if (technology == NULL)
return -ENXIO;
- if (g_atomic_int_exchange_and_add(&technology->enabled, 1) == 0) {
+ if (__sync_fetch_and_add(&technology->enabled, 1) == 0) {
__connman_notifier_enable(type);
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;
}
}
if (msg != NULL) {
- technology->pending_reply = dbus_message_ref(msg);
/*
* 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
__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)
+ return 0;
+
for (list = technology->device_list; list; list = list->next) {
struct connman_device *device = list->data;
}
done:
- if (ret == 0)
+ if (ret == 0) {
+ if (msg != NULL)
+ g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
return ret;
+ }
if (msg != NULL) {
- if (err == -EINPROGRESS)
+ if (err == -EINPROGRESS) {
+ technology->pending_reply = dbus_message_ref(msg);
technology->pending_timeout = g_timeout_add_seconds(10,
technology_pending_reply, technology);
- else {
+ } else {
reply = __connman_error_failed(msg, -err);
if (reply != NULL)
g_dbus_send_message(connection, reply);
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;
}
- if (g_atomic_int_dec_and_test(&technology->enabled) == TRUE) {
- __connman_notifier_disable(type);
- technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
- state_changed(technology);
- }
+ if (__sync_fetch_and_sub(&technology->enabled, 1) != 1)
+ return 0;
+
+ __connman_notifier_disable(type);
+ technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
+ state_changed(technology);
return 0;
}
goto done;
}
+ if (technology->tethering == TRUE)
+ set_tethering(technology, FALSE);
+
if (msg != NULL) {
- technology->pending_reply = dbus_message_ref(msg);
technology->enable_persistent = FALSE;
save_state(technology);
}
}
done:
- if (ret == 0)
+ if (ret == 0) {
+ if (msg != NULL)
+ g_dbus_send_reply(connection, msg, DBUS_TYPE_INVALID);
return ret;
+ }
if (msg != NULL) {
- if (err == -EINPROGRESS)
+ if (err == -EINPROGRESS) {
+ technology->pending_reply = dbus_message_ref(msg);
technology->pending_timeout = g_timeout_add_seconds(10,
technology_pending_reply, technology);
- else {
+ } else {
reply = __connman_error_failed(msg, -err);
if (reply != NULL)
g_dbus_send_message(connection, reply);
if (rfkill == NULL)
return -ENOMEM;
+ __connman_notifier_register(type);
+
rfkill->index = index;
rfkill->type = type;
rfkill->softblock = softblock;
projects / framework / connectivity / connman.git / blobdiff