static GSList *technology_list = NULL;
+static connman_bool_t global_offlinemode;
+
struct connman_rfkill {
unsigned int index;
enum connman_service_type type;
};
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 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) {
+ 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 {
+ technology->enable_persistent = FALSE;
+ g_clear_error(&error);
+ }
+done:
+ g_free(identifier);
+
+ g_key_file_free(keyfile);
+
+ return;
+}
+
+static void save_state(struct connman_technology *technology)
+{
+ GKeyFile *keyfile;
+ gchar *identifier;
+
+ DBG("technology %p", technology);
+
+ keyfile = __connman_storage_load_global();
+ if (keyfile == NULL)
+ keyfile = g_key_file_new();
+
+ 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);
+
+done:
+ g_free(identifier);
+
+ __connman_storage_save_global(keyfile);
+
+ 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 TRUE;
+
+ offlinemode = g_key_file_get_boolean(keyfile, "global",
+ "OfflineMode", &error);
+ if (error != NULL) {
+ offlinemode = TRUE;
+ g_clear_error(&error);
+ }
+
+ g_key_file_free(keyfile);
+
+ return offlinemode;
+}
+
static DBusMessage *get_properties(DBusConnection *conn,
DBusMessage *message, void *user_data)
{
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;
}
technology->pending_reply = NULL;
technology->state = CONNMAN_TECHNOLOGY_STATE_OFFLINE;
- __connman_storage_load_technology(technology);
+ load_state(technology);
if (g_dbus_register_interface(connection, technology->path,
CONNMAN_TECHNOLOGY_INTERFACE,
{
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) {
{
struct connman_technology *technology;
enum connman_service_type type;
- connman_bool_t offlinemode = __connman_profile_get_offlinemode();
DBG("device %p", device);
if (technology == NULL)
return -ENXIO;
- if (technology->enable_persistent && !offlinemode)
+ if (technology->enable_persistent && !global_offlinemode)
__connman_device_enable(device);
/* if technology persistent state is offline */
if (!technology->enable_persistent)
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
* the state here.
*/
technology->enable_persistent = TRUE;
- __connman_storage_save_technology(technology);
+ 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)
+ 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;
- __connman_storage_save_technology(technology);
+ save_state(technology);
}
__connman_rfkill_block(technology->type, TRUE);
}
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);
GSList *list;
int err = -EINVAL;
+ if (global_offlinemode == offlinemode)
+ return 0;
+
DBG("offlinemode %s", offlinemode ? "On" : "Off");
+
/*
* This is a bit tricky. When you set offlinemode, there is no
* way to differentiate between attempting offline mode and
* technology's persistent state. Hence we set the offline mode here
* but save it & call the notifier only if its successful.
*/
- __connman_profile_set_offlinemode(offlinemode);
+
+ global_offlinemode = offlinemode;
/* Traverse technology list, enable/disable each technology. */
for (list = technology_list; list; list = list->next) {
}
if (err == 0 || err == -EINPROGRESS || err == -EALREADY) {
- __connman_profile_save_default();
+ connman_technology_save_offlinemode();
__connman_notifier_offlinemode(offlinemode);
- }
+ } else
+ global_offlinemode = connman_technology_load_offlinemode();
return err;
}
{
struct connman_technology *technology;
struct connman_rfkill *rfkill;
- connman_bool_t offlinemode = __connman_profile_get_offlinemode();
DBG("index %u type %d soft %u hard %u", index, type,
softblock, hardblock);
if (rfkill == NULL)
return -ENOMEM;
+ __connman_notifier_register(type);
+
rfkill->index = index;
rfkill->type = type;
rfkill->softblock = softblock;
* 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 (offlinemode) {
+ if (global_offlinemode) {
if (!softblock)
return __connman_rfkill_block(type, TRUE);
} else {
{
struct connman_technology *technology;
struct connman_rfkill *rfkill;
- connman_bool_t offlinemode = __connman_profile_get_offlinemode();
DBG("index %u soft %u hard %u", index, softblock, hardblock);
return 0;
}
- if (!offlinemode) {
+ if (!global_offlinemode) {
if (technology->enable_persistent && softblock)
return __connman_rfkill_block(type, FALSE);
if (!technology->enable_persistent && !softblock)
return 0;
}
-static int technology_load(struct connman_technology *technology)
-{
- const char *ident = __connman_profile_active_ident();
- GKeyFile *keyfile;
- gchar *identifier;
- GError *error = NULL;
- connman_bool_t enable;
-
- DBG("technology %p", technology);
-
- keyfile = __connman_storage_open_profile(ident);
- if (keyfile == NULL)
- return 0;
-
- 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);
-done:
- g_free(identifier);
-
- __connman_storage_close_profile(ident, keyfile, FALSE);
-
- return 0;
-}
-
-static int technology_save(struct connman_technology *technology)
-{
- const char *ident = __connman_profile_active_ident();
- GKeyFile *keyfile;
- gchar *identifier;
-
- DBG("technology %p", technology);
-
- keyfile = __connman_storage_open_profile(ident);
- if (keyfile == NULL)
- return 0;
-
- 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);
-
-done:
- g_free(identifier);
-
- __connman_storage_close_profile(ident, keyfile, TRUE);
-
- return 0;
-}
-
-static struct connman_storage tech_storage = {
- .name = "technology",
- .priority = CONNMAN_STORAGE_PRIORITY_LOW,
- .tech_load = technology_load,
- .tech_save = technology_save,
-};
-
int __connman_technology_init(void)
{
DBG("");
connection = connman_dbus_get_connection();
- return connman_storage_register(&tech_storage);
+ global_offlinemode = connman_technology_load_offlinemode();
+
+ return 0;
}
void __connman_technology_cleanup(void)
DBG("");
dbus_connection_unref(connection);
-
- connman_storage_unregister(&tech_storage);
}
projects / framework / connectivity / connman.git / blobdiff