};
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;
case CONNMAN_SERVICE_TYPE_BLUETOOTH:
return "Bluetooth";
case CONNMAN_SERVICE_TYPE_CELLULAR:
- return "3G";
+ return "Cellular";
}
return NULL;
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
}
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;
}
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);